From 3fbf8e77787381b56d3c80b6ecb08d302fddedf4 Mon Sep 17 00:00:00 2001 From: David Shiflet Date: Wed, 6 Apr 2022 11:45:37 -0400 Subject: [PATCH 1/2] use correct divider for instance name --- pkg/sqlcmd/util.go | 2 +- pkg/sqlcmd/variables_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/sqlcmd/util.go b/pkg/sqlcmd/util.go index 5de83ab8..fc0fb08a 100644 --- a/pkg/sqlcmd/util.go +++ b/pkg/sqlcmd/util.go @@ -30,7 +30,7 @@ func splitServer(serverName string) (string, string, uint64, error) { } serverName = serverNameParts[0] } else { - serverNameParts = strings.Split(serverName, "/") + serverNameParts = strings.Split(serverName, "\\") if len(serverNameParts) > 2 { return "", "", 0, &InvalidServerName } diff --git a/pkg/sqlcmd/variables_test.go b/pkg/sqlcmd/variables_test.go index 6c1f75fb..45b8ae5b 100644 --- a/pkg/sqlcmd/variables_test.go +++ b/pkg/sqlcmd/variables_test.go @@ -47,10 +47,10 @@ func TestEnvironmentVariablesAsInput(t *testing.T) { func TestSqlServerSplitsName(t *testing.T) { vars := Variables{ - SQLCMDSERVER: `tcp:someserver/someinstance`, + SQLCMDSERVER: `tcp:someserver\someinstance`, } serverName, instance, port, err := vars.SQLCmdServer() - if assert.NoError(t, err, "tcp:server/someinstance") { + if assert.NoError(t, err, "tcp:server\\someinstance") { assert.Equal(t, "someserver", serverName, "server name for instance") assert.Equal(t, uint64(0), port, "port for instance") assert.Equal(t, "someinstance", instance, "instance for instance") From 55a5d46a2e913df3d8ba94d54bc6900736cc87a5 Mon Sep 17 00:00:00 2001 From: David Shiflet Date: Wed, 6 Apr 2022 11:58:23 -0400 Subject: [PATCH 2/2] fix test --- pkg/sqlcmd/sqlcmd_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/sqlcmd/sqlcmd_test.go b/pkg/sqlcmd/sqlcmd_test.go index 7014f336..3bd6159f 100644 --- a/pkg/sqlcmd/sqlcmd_test.go +++ b/pkg/sqlcmd/sqlcmd_test.go @@ -41,7 +41,7 @@ func TestConnectionStringFromSqlCmd(t *testing.T) { "sqlserver://.?database=somedatabase&encrypt=false&workstation+id=mystation", }, { - &ConnectSettings{TrustServerCertificate: true, Password: pwd, ServerName: `someserver/instance`, Database: "somedatabase", UserName: "someuser"}, + &ConnectSettings{TrustServerCertificate: true, Password: pwd, ServerName: `someserver\instance`, Database: "somedatabase", UserName: "someuser"}, fmt.Sprintf("sqlserver://someuser:%s@someserver/instance?database=somedatabase&trustservercertificate=true", pwd), }, {