Saving changes

Author: stuartpa

cmd/modern/root/use.go

@@ -83,15 +83,22 @@ func (c *Use) run() {
 	useDatabase.CopyToContainer(id)
 
 	if useDatabase.IsExtractionNeeded() {
-		output.output.Infof("Extracting files from %q", useDatabase.UrlFilename())
+		output.Infof("Extracting files from %q", useDatabase.UrlFilename())
 		useDatabase.Extract()
 	}
 
+	output.output.Infof("Bringing %q online using %q method",
+		useDatabase.DatabaseName(),
+		useDatabase.OnlineMethod(),
+	)
+
 	useDatabase.BringOnline(
 		c.sql.Query,
 		user.BasicAuth.Username,
 		secret.Decode(user.BasicAuth.Password, user.BasicAuth.PasswordEncryption),
 	)
+
+	output.InfoDatabaseOnline(useDatabase.DatabaseName())
 }
 
 func (c *Use) query(commandText string) {

cmd/modern/root/use_output.go

@@ -3,10 +3,11 @@ package root
 import (
 	"fmt"
 	"github.com/microsoft/go-sqlcmd/internal/output"
+	"runtime"
 )
 
 type useOutput struct {
-	*output.Output
+	output.Output
 	output *output.Output
 }
 
@@ -27,3 +28,17 @@ func (u *useOutput) FatalDatabaseSourceFileNotExist(url string) {
 		[]string{fmt.Sprintf("File does not exist at URL %q", url)},
 		"Unable to download file to container")
 }
+
+func (u *useOutput) InfoDatabaseOnline(databaseName string) {
+	hints := [][]string{}
+
+	// TODO: sqlcmd open ads only support on Windows/Mac right now, add Linux support
+	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
+		hints = append(hints, []string{"Open in Azure Data Studio", "sqlcmd open ads"})
+	}
+
+	hints = append(hints, []string{"Run a query", "sqlcmd query \"SELECT DB_NAME()\""})
+	hints = append(hints, []string{"See connection strings", "sqlcmd config connection-strings"})
+
+	u.output.InfofWithHintExamples(hints, "Database %q is now online", databaseName)
+}

pkg/mssqlcontainer/ingest/ingest.go

@@ -39,6 +39,10 @@ func (i *ingest) UrlFilename() string {
 	return i.url.Filename
 }
 
+func (i *ingest) OnlineMethod() string {
+	return i.mechanism.Name()
+}
+
 func (i *ingest) DatabaseName() string {
 	return i.url.DatabaseName
 }

pkg/mssqlcontainer/ingest/interface.go

@@ -9,6 +9,7 @@ type Ingest interface {
 	SourceFileExists() bool
 	DatabaseName() string
 	UrlFilename() string
+	OnlineMethod() string
 	UserProvidedFileExt() string
 
 	CopyToContainer(containerId string)

pkg/mssqlcontainer/ingest/mechanism/bacpac.go renamed to pkg/mssqlcontainer/ingest/mechanism/dacfx.go

@@ -5,28 +5,28 @@ import (
 	"github.com/microsoft/go-sqlcmd/internal/container"
 )
 
-type bacpac struct {
+type dacfx struct {
 	controller  *container.Controller
 	containerId string
 }
 
-func (m *bacpac) Initialize(controller *container.Controller) {
+func (m *dacfx) Initialize(controller *container.Controller) {
 	m.controller = controller
 }
 
-func (m *bacpac) CopyToLocation() string {
+func (m *dacfx) CopyToLocation() string {
 	return "/var/opt/mssql/backup"
 }
 
-func (m *bacpac) Name() string {
+func (m *dacfx) Name() string {
 	return "dacfx"
 }
 
-func (m *bacpac) FileTypes() []string {
+func (m *dacfx) FileTypes() []string {
 	return []string{"bacpac", "dacpac"}
 }
 
-func (m *bacpac) BringOnline(
+func (m *dacfx) BringOnline(
 	databaseName string,
 	containerId string,
 	query func(string),
@@ -36,7 +36,7 @@ func (m *bacpac) BringOnline(
 	m.installSqlPackage()
 	m.setDefaultDatabaseToMaster(options.Username, query)
 
-	m.RunCommand([]string{
+	_, stderr := m.RunCommand([]string{
 		"/home/mssql/.dotnet/tools/sqlpackage",
 		"/Diagnostics:true",
 		"/Action:import",
@@ -47,23 +47,40 @@ func (m *bacpac) BringOnline(
 		"/TargetUser:" + options.Username,
 		"/TargetPassword:" + options.Password,
 	})
+
+	if len(stderr) == 0 {
+		// Remove the source bacpac file
+		m.RunCommandAsRoot([]string{"rm", m.CopyToLocation() + "/" + options.Filename})
+	}
 }
 
-func (m *bacpac) setDefaultDatabaseToMaster(username string, query func(string)) {
+func (m *dacfx) setDefaultDatabaseToMaster(username string, query func(string)) {
 	alterDefaultDb := fmt.Sprintf(
 		"ALTER LOGIN [%s] WITH DEFAULT_DATABASE = [%s]",
 		username,
 		"master")
 	query(alterDefaultDb)
 }
 
-func (m *bacpac) installSqlPackage() {
+func (m *dacfx) installSqlPackage() {
 	if m.controller == nil {
 		panic("controller is nil")
 	}
 
+	m.installDotNet()
+
+	// Check if sqlpackage is installed, if not, install it
+	_, stderr := m.RunCommand([]string{"/home/mssql/.dotnet/tools/sqlpackage", "/version"})
+	if len(stderr) > 0 {
+		m.RunCommand([]string{"/opt/dotnet/dotnet", "tool", "install", "-g", "microsoft.sqlpackage"})
+	}
+}
+
+func (m *dacfx) installDotNet() {
+	// Check if dotnet is installed, if not, install it
 	_, stderr := m.RunCommand([]string{"/opt/dotnet/dotnet", "--version"})
 	if len(stderr) > 0 {
+		// Download dotnet-install.sh and run it
 		m.RunCommand([]string{"wget", "https://dot.net/v1/dotnet-install.sh", "-O", "/tmp/dotnet-install.sh"})
 		m.RunCommand([]string{"chmod", "+x", "/tmp/dotnet-install.sh"})
 		m.RunCommand([]string{"/tmp/dotnet-install.sh", "--install-dir", "/opt/dotnet"})
@@ -73,23 +90,29 @@ func (m *bacpac) installSqlPackage() {
 		m.RunCommandAsRoot([]string{"mkdir", "-p", "/home/mssql"})
 		m.RunCommandAsRoot([]string{"chown", "mssql:root", "/home/mssql"})
 
-		m.RunCommand([]string{"/bin/bash", "-c", "echo 'export DOTNET_ROOT=/opt/dotnet' > /home/mssql/.bashrc"})
-		m.RunCommand([]string{"/bin/bash", "-c", "echo 'export PATH=$PATH:$DOTNET_ROOT:/home/mssql/.dotnet/tools' >> /home/mssql/.bashrc"})
+		// Add dotnet to the path
+		m.AddTextLineToFile(
+			"export DOTNET_ROOT=/opt/dotnet",
+			"/home/mssql/.bashrc",
+		)
+		m.AddTextLineToFile(
+			"export PATH=$PATH:$DOTNET_ROOT:/home/mssql/.dotnet/tools",
+			"/home/mssql/.bashrc",
+		)
 	}
+}
 
-	_, stderr = m.RunCommand([]string{"/home/mssql/.dotnet/tools/sqlpackage", "/version"})
-	if len(stderr) > 0 {
-		m.RunCommand([]string{"/opt/dotnet/dotnet", "tool", "install", "-g", "microsoft.sqlpackage"})
-	}
+func (m *dacfx) AddTextLineToFile(text string, file string) ([]byte, []byte) {
+	return m.RunCommand([]string{"/bin/bash", "-c", fmt.Sprintf("echo '%v' >> %v", text, file)})
 }
 
-func (m *bacpac) RunCommand(s []string) ([]byte, []byte) {
+func (m *dacfx) RunCommand(s []string) ([]byte, []byte) {
 	return m.controller.RunCmdInContainer(m.containerId, s, container.ExecOptions{
 		Env: []string{"DOTNET_ROOT=/opt/dotnet"},
 	})
 }
 
-func (m *bacpac) RunCommandAsRoot(s []string) ([]byte, []byte) {
+func (m *dacfx) RunCommandAsRoot(s []string) ([]byte, []byte) {
 	return m.controller.RunCmdInContainer(m.containerId, s, container.ExecOptions{
 		User: "root",
 	})

pkg/mssqlcontainer/ingest/mechanism/mechanism.go

@@ -2,7 +2,7 @@ package mechanism
 
 var mechanisms = []Mechanism{
 	&attach{},
-	&bacpac{},
+	&dacfx{},
 	&restore{},
 }