Skip to content

Commit 75c2815

Browse files
authored
use correct divider for instance name (#75)
* use correct divider for instance name * fix test
1 parent 47a414b commit 75c2815

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

pkg/sqlcmd/sqlcmd_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestConnectionStringFromSqlCmd(t *testing.T) {
4141
"sqlserver://.?database=somedatabase&encrypt=false&workstation+id=mystation",
4242
},
4343
{
44-
&ConnectSettings{TrustServerCertificate: true, Password: pwd, ServerName: `someserver/instance`, Database: "somedatabase", UserName: "someuser"},
44+
&ConnectSettings{TrustServerCertificate: true, Password: pwd, ServerName: `someserver\instance`, Database: "somedatabase", UserName: "someuser"},
4545
fmt.Sprintf("sqlserver://someuser:%s@someserver/instance?database=somedatabase&trustservercertificate=true", pwd),
4646
},
4747
{

pkg/sqlcmd/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func splitServer(serverName string) (string, string, uint64, error) {
3030
}
3131
serverName = serverNameParts[0]
3232
} else {
33-
serverNameParts = strings.Split(serverName, "/")
33+
serverNameParts = strings.Split(serverName, "\\")
3434
if len(serverNameParts) > 2 {
3535
return "", "", 0, &InvalidServerName
3636
}

pkg/sqlcmd/variables_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ func TestEnvironmentVariablesAsInput(t *testing.T) {
4747

4848
func TestSqlServerSplitsName(t *testing.T) {
4949
vars := Variables{
50-
SQLCMDSERVER: `tcp:someserver/someinstance`,
50+
SQLCMDSERVER: `tcp:someserver\someinstance`,
5151
}
5252
serverName, instance, port, err := vars.SQLCmdServer()
53-
if assert.NoError(t, err, "tcp:server/someinstance") {
53+
if assert.NoError(t, err, "tcp:server\\someinstance") {
5454
assert.Equal(t, "someserver", serverName, "server name for instance")
5555
assert.Equal(t, uint64(0), port, "port for instance")
5656
assert.Equal(t, "someinstance", instance, "instance for instance")

0 commit comments

Comments
 (0)