Skip to content

use correct divider for instance name #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2022
Merged

use correct divider for instance name #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fbf8e7
use correct divider for instance name
shueybubbles Apr 6, 2022
55a5d46
fix test
shueybubbles Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/sqlcmd/sqlcmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
{
Expand Down
2 changes: 1 addition & 1 deletion pkg/sqlcmd/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/sqlcmd/variables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down