Saving changes

Author: stuartpa

internal/container/controller.go

@@ -305,6 +305,7 @@ func (c Controller) RunCmdInContainer(id string, cmd []string) ([]byte, []byte)
 			AttachStderr: true,
 			AttachStdout: true,
 			Cmd:          cmd,
+			Env:          []string{"DOTNET_ROOT=/root/.dotnet"},
 		},
 	)
 	checkErr(err)

internal/databaseurl/factory.go

@@ -0,0 +1,69 @@
+package databaseurl
+
+import (
+	"fmt"
+	url2 "net/url"
+	"path/filepath"
+	"strings"
+)
+
+func NewDatabaseUrl(url string) *DatabaseUrl {
+	databaseUrl := DatabaseUrl{}
+
+	// To enable URL.Parse, switch to / from \\
+	url = strings.Replace(url, "\\", "/", -1)
+
+	// Cope with a URL that has no schema, e.g. in local dir, or local folder \foo.mdf
+	if !strings.Contains(url, "/") {
+		url = "./" + url
+	}
+
+	var err error
+	parsedUrl, err := url2.Parse(url)
+	if err != nil {
+		panic(err)
+	}
+
+	databaseUrl.URL = parsedUrl
+
+	fmt.Println("databaseUrl.URL.Path: " + databaseUrl.URL.Path)
+
+	databaseUrl.Filename = filepath.Base(databaseUrl.URL.Path)
+	databaseUrl.FileExtension = strings.TrimLeft(filepath.Ext(databaseUrl.Filename), ".")
+
+	split := strings.Split(databaseUrl.URL.Path, ",")
+	if len(split) > 1 {
+		databaseUrl.DatabaseName = split[1]
+
+		// Remove the database name (specified after the comma)  from the URL, and reparse it
+		url = strings.Replace(url, ","+split[1], "", 1)
+		databaseUrl.URL, err = databaseUrl.URL.Parse(url)
+		if err != nil {
+			panic(err)
+		}
+
+		split := strings.Split(databaseUrl.FileExtension, ",")
+		databaseUrl.FileExtension = split[0]
+
+		split = strings.Split(databaseUrl.Filename, ",")
+		databaseUrl.Filename = split[0]
+	} else {
+
+		databaseUrl.DatabaseName = strings.TrimSuffix(
+			databaseUrl.Filename,
+			"."+databaseUrl.FileExtension,
+		)
+	}
+
+	fmt.Println("databaseUrl.Filename: " + databaseUrl.Filename)
+	fmt.Println("databaseUrl.FileExtension: " + databaseUrl.FileExtension)
+	fmt.Println("databaseUrl.DatabaseName: " + databaseUrl.DatabaseName)
+
+	databaseUrl.IsLocal = databaseUrl.URL.Scheme == "file" || len(databaseUrl.URL.Scheme) < 3
+
+	escapedDbName := strings.ReplaceAll(databaseUrl.DatabaseName, "'", "''")
+	databaseUrl.DatabaseNameAsTsqlIdentifier = strings.ReplaceAll(escapedDbName, "]", "]]")
+	databaseUrl.DatabaseNameAsNonTsqlIdentifier = strings.ReplaceAll(databaseUrl.DatabaseName, "]", "]]")
+
+	return &databaseUrl
+}

internal/databaseurl/type.go

@@ -0,0 +1,19 @@
+package databaseurl
+
+import "net/url"
+
+type DatabaseUrl struct {
+	*url.URL
+	Filename      string
+	FileExtension string
+	IsLocal       bool
+
+	// DatabaseName returns the databaseName from --using arg
+	// It sets database name to the specified database name
+	// or in absence of it, it is set to the filename without
+	// extension.
+	DatabaseName string
+
+	DatabaseNameAsTsqlIdentifier    string
+	DatabaseNameAsNonTsqlIdentifier string
+}

internal/uri/uri_test.go internal/databaseurl/uri_test.gointernal/uri/uri_test.go renamed to internal/databaseurl/uri_test.go

@@ -1,4 +1,4 @@
-package uri
+package databaseurl
 
 import (
 	"github.com/stretchr/testify/assert"
@@ -19,7 +19,7 @@ func TestExtractUrl(t *testing.T) {
 
 	for _, testcase := range tests {
 		u := NewUri(testcase.inputURL)
-		assert.Equal(t, testcase.expectedURL, u.ActualUrl(),
+		assert.Equal(t, testcase.expectedURL, u.ActualUrl,
 			"Extracted URL does not match expected URL")
 	}
 }
@@ -54,7 +54,7 @@ func TestParseDbName(t *testing.T) {
 
 	for _, testcase := range tests {
 		u := NewUri(testcase.inputURL)
-		assert.Equal(t, testcase.expectedURL, u.ParseDbName(),
+		assert.Equal(t, testcase.expectedURL, u.DatabaseName,
 			"Extracted DB Name does not match expected DB Name")
 	}
 }
@@ -92,9 +92,9 @@ func TestGetDbNameIfExists(t *testing.T) {
 	for _, testcase := range tests {
 		u := NewUri(testcase.input)
 
-		assert.Equal(t, testcase.expectedIdentifierOp, u.GetDbNameAsIdentifier(),
+		assert.Equal(t, testcase.expectedIdentifierOp, u.DatabaseNameAsTsqlIdentifier,
 			"Unexpected database name as identifier")
-		assert.Equal(t, testcase.expectedNonIdentifierOp, u.GetDbNameAsNonIdentifier(),
+		assert.Equal(t, testcase.expectedNonIdentifierOp, u.DatabaseNameAsNonTsqlIdentifier,
 			"Unexpected database name as non-identifier")
 	}
 }

internal/uri/factory.go

@@ -29,6 +29,7 @@ func (e *sevenZip) Extract(srcFile string, destFolder string) (string, string) {
 	e.controller.RunCmdInContainer(e.containerId, []string{
 		"/opt/7-zip/7zz",
 		"x",
+		"-aoa",
 		"-o" + destFolder,
 		"/var/opt/mssql/backup/" + srcFile,
 	})

internal/uri/type.go

@@ -2,21 +2,21 @@ package ingest
 
 import (
 	"github.com/microsoft/go-sqlcmd/internal/container"
-	"github.com/microsoft/go-sqlcmd/internal/uri"
+	"github.com/microsoft/go-sqlcmd/internal/databaseurl"
 	"github.com/microsoft/go-sqlcmd/pkg/mssqlcontainer/ingest/extract"
 	"github.com/microsoft/go-sqlcmd/pkg/mssqlcontainer/ingest/location"
 	"github.com/microsoft/go-sqlcmd/pkg/mssqlcontainer/ingest/mechanism"
 	"strings"
 )
 
 func NewIngest(databaseUri string, controller *container.Controller, options IngestOptions) Ingest {
-	uri := uri.NewUri(databaseUri)
+	databaseUrl := databaseurl.NewDatabaseUrl(databaseUri)
 
 	return &ingest{
-		uri:        uri,
+		uri:        databaseUrl,
 		controller: controller,
-		location:   location.NewLocation(uri.IsLocal(), uri.ActualUrl(), controller),
-		mechanism:  mechanism.NewMechanism(uri.FileExtension(), options.Mechanism, controller),
+		location:   location.NewLocation(databaseUrl.IsLocal, databaseUrl.String(), controller),
+		mechanism:  mechanism.NewMechanism(databaseUrl.FileExtension, options.Mechanism, controller),
 	}
 }
 

internal/uri/uri.go

@@ -3,7 +3,7 @@ package ingest
 import (
 	"fmt"
 	"github.com/microsoft/go-sqlcmd/internal/container"
-	"github.com/microsoft/go-sqlcmd/internal/uri"
+	"github.com/microsoft/go-sqlcmd/internal/databaseurl"
 	"github.com/microsoft/go-sqlcmd/pkg/mssqlcontainer/ingest/extract"
 	"github.com/microsoft/go-sqlcmd/pkg/mssqlcontainer/ingest/location"
 	"github.com/microsoft/go-sqlcmd/pkg/mssqlcontainer/ingest/mechanism"
@@ -12,7 +12,7 @@ import (
 )
 
 type ingest struct {
-	uri         uri.Uri
+	uri         *databaseurl.DatabaseUrl
 	location    location.Location
 	controller  *container.Controller
 	mechanism   mechanism.Mechanism
@@ -23,7 +23,7 @@ type ingest struct {
 }
 
 func (i *ingest) IsExtractionNeeded() bool {
-	i.extractor = extract.NewExtractor(i.uri.FileExtension(), i.controller)
+	i.extractor = extract.NewExtractor(i.uri.FileExtension, i.controller)
 	if i.extractor == nil {
 		return false
 	} else {
@@ -36,12 +36,12 @@ func (i *ingest) IsRemoteUrl() bool {
 }
 
 func (i *ingest) UrlFilename() string {
-	return i.uri.Filename()
+	return i.uri.Filename
 }
 
 func (i *ingest) IsValidScheme() bool {
 	for _, s := range i.location.ValidSchemes() {
-		if s == i.uri.Scheme() {
+		if s == i.uri.Scheme {
 			return true
 		}
 	}
@@ -59,7 +59,7 @@ func (i *ingest) CopyToContainer(containerId string) {
 
 	i.containerId = containerId
 	i.location.CopyToContainer(containerId, destFolder)
-	i.options.Filename = i.uri.Filename()
+	i.options.Filename = i.uri.Filename
 
 	if i.options.Filename == "" {
 		panic("filename is empty")
@@ -76,7 +76,7 @@ func (i *ingest) Extract() {
 	}
 
 	i.options.Filename, i.options.LdfFilename =
-		i.extractor.Extract(i.uri.Filename(), "/var/opt/mssql/data")
+		i.extractor.Extract(i.uri.Filename, "/var/opt/mssql/data")
 
 	if i.mechanism == nil {
 		ext := strings.TrimLeft(filepath.Ext(i.options.Filename), ".")
@@ -88,11 +88,18 @@ func (i *ingest) BringOnline(query func(string), username string, password strin
 	if i.options.Filename == "" {
 		panic("filename is empty, did you call CopyToContainer()?")
 	}
+	if query == nil {
+		panic("query is nil")
+	}
+	if i.mechanism == nil {
+		panic("mechanism is nil")
+	}
 
 	i.query = query
 	i.options.Username = username
 	i.options.Password = password
-	i.mechanism.BringOnline(i.uri.GetDbNameAsIdentifier(), i.containerId, i.query, i.options)
+	fmt.Println(i.uri.DatabaseNameAsTsqlIdentifier)
+	i.mechanism.BringOnline(i.uri.DatabaseNameAsTsqlIdentifier, i.containerId, i.query, i.options)
 	i.setDefaultDatabase(username)
 }
 
@@ -104,18 +111,18 @@ func (i *ingest) setDefaultDatabase(username string) {
 	alterDefaultDb := fmt.Sprintf(
 		"ALTER LOGIN [%s] WITH DEFAULT_DATABASE = [%s]",
 		username,
-		i.uri.GetDbNameAsNonIdentifier())
+		i.uri.DatabaseNameAsNonTsqlIdentifier)
 	i.query(alterDefaultDb)
 }
 
 func (i *ingest) IsValidFileExtension() bool {
 	for _, m := range mechanism.FileTypes() {
-		if m == i.uri.FileExtension() {
+		if m == i.uri.FileExtension {
 			return true
 		}
 	}
 	for _, e := range extract.FileTypes() {
-		if e == i.uri.FileExtension() {
+		if e == i.uri.FileExtension {
 			return true
 		}
 	}
@@ -127,7 +134,7 @@ func (i *ingest) SourceFileExists() bool {
 }
 
 func (i *ingest) UserProvidedFileExt() string {
-	return i.uri.FileExtension()
+	return i.uri.FileExtension
 }
 
 func (i *ingest) ValidSchemes() []string {