Add .7z support

Author: stuartpa

cmd/modern/main.go

@@ -52,10 +52,6 @@ func main() {
 	if strings.HasPrefix(os.Args[1], "sqlcmd://") {
 		sqlcmdUrl := strings.TrimRight(os.Args[1][9:], "/")
 
-		//fmt.Printf("%q", sqlcmdUrl)
-
-		//_, _ = fmt.Scanln(&input)
-
 		data2, err := base64.StdEncoding.DecodeString(sqlcmdUrl)
 		if err == nil {
 			var genre2 []string

cmd/modern/root/install/mssql-base.go

@@ -227,7 +227,7 @@ func (c *MssqlBase) AddFlags(
 
 	addFlag(cmdparser.FlagOptions{
 		String:        &c.openTool,
-		DefaultString: "ads",
+		DefaultString: "",
 		Name:          "open",
 		Usage:         "Open tool e.g. ads",
 	})

cmd/modern/root/use.go

@@ -7,6 +7,7 @@ import (
 	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
 	"github.com/microsoft/go-sqlcmd/internal/config"
 	"github.com/microsoft/go-sqlcmd/internal/container"
+	"github.com/microsoft/go-sqlcmd/internal/secret"
 	"github.com/microsoft/go-sqlcmd/internal/sql"
 	"github.com/microsoft/go-sqlcmd/pkg/mssqlcontainer"
 )
@@ -61,14 +62,14 @@ func (c *Use) run() {
 		endpoint, user := config.CurrentContext()
 
 		c.sql = sql.New(sql.SqlOptions{UnitTesting: false})
-		c.sql.Connect(endpoint, user, sql.ConnectOptions{Interactive: false})
+		c.sql.Connect(endpoint, user, sql.ConnectOptions{Database: "master", Interactive: false})
 
 		mssqlcontainer.DownloadAndRestoreDb(
 			controller,
 			id,
 			c.url,
 			user.BasicAuth.Username,
-			user.BasicAuth.Password,
+			secret.Decode(user.BasicAuth.Password, user.BasicAuth.PasswordEncryption),
 			c.query,
 			c.Cmd.Output(),
 		)

pkg/mssqlcontainer/ingest-db.go

@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"path"
 	"path/filepath"
+	"regexp"
 	"strings"
 )
 
@@ -28,7 +29,6 @@ func ValidateUsingUrlExists(
 	}
 
 	if len(u.Scheme) > 3 {
-
 		if u.Path == "" {
 			output.FatalfWithHints(
 				[]string{
@@ -77,15 +77,17 @@ func DownloadAndRestoreDb(
 
 	databaseUrl := extractUrl(usingDatabaseUrl)
 
+	var log_f string
+	var log_file string
+
 	_, file := filepath.Split(databaseUrl)
 
 	// Download file from URL into container
 	output.Infof("Downloading %s", file)
 
 	var f string
 	if len(parsed.Scheme) > 3 {
-		u, _ := url.Parse(usingDatabaseUrl)
-		_, f = filepath.Split(u.Path)
+		_, f = filepath.Split(databaseUrl)
 	} else {
 		_, f = filepath.Split(usingDatabaseUrl)
 	}
@@ -117,14 +119,23 @@ func DownloadAndRestoreDb(
 	}
 
 	if filepath.Ext(f) == ".7z" {
+		controller.RunCmdInContainer(containerId, []string{
+			"mkdir",
+			"/opt/7-zip"})
+
 		controller.RunCmdInContainer(containerId, []string{
 			"wget",
 			"-O",
 			"/opt/7-zip/7-zip.tar",
 			"https://7-zip.org/a/7z2201-linux-x64.tar.xz"})
 
-		controller.RunCmdInContainer(containerId, []string{"tar", "xvf", "/tmp/7-zip.tar"})
-		controller.RunCmdInContainer(containerId, []string{"mkdir", "/opt/7-zip"})
+		controller.RunCmdInContainer(containerId, []string{
+			"tar",
+			"xvf",
+			"/opt/7-zip/7-zip.tar",
+			"-C",
+			"/opt/7-zip",
+		})
 		controller.RunCmdInContainer(containerId, []string{"chmod", "u+x", "/opt/7-zip/7zz"})
 		controller.RunCmdInContainer(containerId, []string{
 			"/opt/7-zip/7zz",
@@ -133,17 +144,30 @@ func DownloadAndRestoreDb(
 			temporaryFolder + "/" + file,
 		})
 
-		controller.RunCmdInContainer(containerId, []string{
+		stdout, _ := controller.RunCmdInContainer(containerId, []string{
 			"./opt/7-zip/7zz",
 			"l",
 			"-ba",
 			"-slt",
 			temporaryFolder + "/" + file,
 		})
 
-		databaseName = "StackOverflow2010"
-		f = "StackOverflow2010.mdf"
+		databaseName = parseDbName(usingDatabaseUrl)
+
 		temporaryFolder = "/var/opt/mssql/data"
+
+		paths := extractPaths(string(stdout))
+		for _, p := range paths {
+			if filepath.Ext(p) == ".mdf" {
+				f = p
+				file = p
+			}
+
+			if filepath.Ext(p) == ".ldf" {
+				log_f = p
+				log_file = p
+			}
+		}
 	}
 
 	dbNameAsIdentifier := getDbNameAsIdentifier(databaseName)
@@ -188,7 +212,7 @@ DECLARE @fileListTable TABLE (
 INSERT INTO @fileListTable
 EXEC('RESTORE FILELISTONLY FROM DISK = ''%s/%s''')
 SET @sql = 'RESTORE DATABASE [%s] FROM DISK = ''%s/%s'' WITH '
-SELECT @sql = @sql + char(13) + ' MOVE ''' + LogicalName + ''' TO ''/var/opt/mssql/' + LogicalName + '.' + RIGHT(PhysicalName,CHARINDEX('\',PhysicalName)) + ''','
+SELECT @sql = @sql + char(13) + ' MOVE ''' + LogicalName + ''' TO ''/var/opt/mssql/data/' + LogicalName + '.' + RIGHT(PhysicalName,CHARINDEX('\',PhysicalName)) + ''','
 FROM @fileListTable
 WHERE IsPresent = 1
 SET @sql = SUBSTRING(@sql, 1, LEN(@sql)-1)
@@ -204,13 +228,26 @@ EXEC(@sql)`
 		controller.RunCmdInContainer(containerId, []string{"chmod", "-u+rw", temporaryFolder + "/" + file})
 		controller.RunCmdInContainer(containerId, []string{"chmod", "-g+r", temporaryFolder + "/" + file})
 
-		text := `SET NOCOUNT ON;
+		text := `SET NOCOUNT ON;`
+		if log_f == "" {
+			text += `CREATE DATABASE [%s]   
+    ON (FILENAME = '%s/%s')
+    FOR ATTACH;`
+			query(fmt.Sprintf(text, dbNameAsIdentifier, temporaryFolder, file))
 
-CREATE DATABASE [%s]   
-    ON (FILENAME = '%s/%s'), (FILENAME = '/var/opt/mssql/data/StackOverflow2010_log.ldf')
+		} else {
+			controller.RunCmdInContainer(containerId, []string{"chown", "mssql:root", temporaryFolder + "/" + log_file})
+			controller.RunCmdInContainer(containerId, []string{"chmod", "-o-r", temporaryFolder + "/" + log_file})
+			controller.RunCmdInContainer(containerId, []string{"chmod", "-u+rw", temporaryFolder + "/" + log_file})
+			controller.RunCmdInContainer(containerId, []string{"chmod", "-g+r", temporaryFolder + "/" + log_file})
+
+			text += `CREATE DATABASE [%s]   
+    ON (FILENAME = '%s/%s'), (FILENAME = '%s/%s') 
     FOR ATTACH;`
 
-		query(fmt.Sprintf(text, dbNameAsIdentifier, temporaryFolder, file))
+			query(fmt.Sprintf(text, dbNameAsIdentifier, temporaryFolder, file, temporaryFolder, log_file))
+		}
+
 	} else if filepath.Ext(f) == ".bacpac" {
 		controller.DownloadFile(
 			containerId,
@@ -223,8 +260,16 @@ CREATE DATABASE [%s]
 		controller.RunCmdInContainer(containerId, []string{"unzip", "/tmp/sqlpackage-linux", "-d", "/opt/sqlpackage"})
 		controller.RunCmdInContainer(containerId, []string{"rm", "/tmp/sqlpackage-linux"})
 		controller.RunCmdInContainer(containerId, []string{"chmod", "+x", "/opt/sqlpackage/sqlpackage"})
+
+		alterDefaultDb := fmt.Sprintf(
+			"ALTER LOGIN [%s] WITH DEFAULT_DATABASE = [%s]",
+			userName,
+			"master")
+		query(alterDefaultDb)
+
 		controller.RunCmdInContainer(containerId, []string{
 			"/opt/sqlpackage/sqlpackage",
+			"/Diagnostics:true",
 			"/Action:import",
 			"/SourceFile:" + temporaryFolder + "/" + file,
 			"/TargetServerName:localhost",
@@ -242,6 +287,16 @@ CREATE DATABASE [%s]
 	query(alterDefaultDb)
 }
 
+func extractPaths(input string) []string {
+	re := regexp.MustCompile(`Path\s*=\s*(\S+)`)
+	matches := re.FindAllStringSubmatch(input, -1)
+	var paths []string
+	for _, match := range matches {
+		paths = append(paths, match[1])
+	}
+	return paths
+}
+
 func getDbNameAsIdentifier(dbName string) string {
 	escapedDbNAme := strings.ReplaceAll(dbName, "'", "''")
 	return strings.ReplaceAll(escapedDbNAme, "]", "]]")

pkg/mssqlcontainer/ingest-db_test.go

@@ -1,6 +1,7 @@
 package mssqlcontainer
 
 import (
+	"fmt"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
@@ -60,3 +61,39 @@ func TestGetDbNameIfExists(t *testing.T) {
 		assert.Equal(t, testcase.expectedNonIdentifierOp, dbnameAsNonIdentifier, "Unexpected database name as non-identifier")
 	}
 }
+
+func TestTzOutput(t *testing.T) {
+	stdout := `Path = Readme_2010.txt
+Size = 1157
+Packed Size = 680
+Modified = 2018-09-11 11:45:55.2543593
+Attributes = A
+CRC = B243D895
+Encrypted = -
+Method = LZMA2:27
+Block = 0
+
+Path = StackOverflow2010.mdf
+Size = 8980398080
+Packed Size = 1130813973
+Modified = 2018-09-11 11:30:55.3142494
+Attributes = A
+CRC = 8D688B2A
+Encrypted = -
+Method = LZMA2:27
+Block = 1
+
+Path = StackOverflow2010_log.ldf
+Size = 268312576
+Packed Size = 37193161
+Modified = 2018-09-11 11:30:55.3152489
+Attributes = A
+CRC = BCA9F91F
+Encrypted = -
+Method = LZMA2:27
+Block = 2`
+
+	paths := extractPaths(stdout)
+
+	fmt.Println(paths)
+}