use tcp before np (#250)

Author: shueybubbles

pkg/sqlcmd/connect.go

@@ -127,7 +127,7 @@ func (connect ConnectSettings) ConnectionString() (connectionString string, err
 		query.Add("applicationintent", connect.ApplicationIntent)
 	}
 	if connect.LoginTimeoutSeconds > 0 {
-		query.Add("connection timeout", fmt.Sprint(connect.LoginTimeoutSeconds))
+		query.Add("dial timeout", fmt.Sprint(connect.LoginTimeoutSeconds))
 	}
 	if connect.PacketSize > 0 {
 		query.Add("packet size", fmt.Sprint(connect.PacketSize))

pkg/sqlcmd/sqlcmd_test.go

@@ -39,8 +39,8 @@ func TestConnectionStringFromSqlCmd(t *testing.T) {
 			"sqlserver://.?database=somedatabase&trustservercertificate=true&workstation+id=mystation",
 		},
 		{
-			&ConnectSettings{WorkstationName: "mystation", Encrypt: "false", Database: "somedatabase"},
-			"sqlserver://.?database=somedatabase&encrypt=false&workstation+id=mystation",
+			&ConnectSettings{WorkstationName: "mystation", Encrypt: "false", Database: "somedatabase", LoginTimeoutSeconds: 50},
+			"sqlserver://.?database=somedatabase&dial+timeout=50&encrypt=false&workstation+id=mystation",
 		},
 		{
 			&ConnectSettings{TrustServerCertificate: true, Password: pwd, ServerName: `someserver\instance`, Database: "somedatabase", UserName: "someuser"},
@@ -631,10 +631,11 @@ func newConnect(t testing.TB) *ConnectSettings {
 }
 
 func TestSqlcmdPrefersSharedMemoryProtocol(t *testing.T) {
-	if runtime.GOOS != "windows" {
-		t.Skip()
+	if runtime.GOOS != "windows" || runtime.GOARCH != "amd64" {
+		t.Skip("Only valid on Windows amd64")
 	}
 	assert.EqualValuesf(t, "lpc", msdsn.ProtocolParsers[0].Protocol(), "lpc should be first protocol")
-	assert.EqualValuesf(t, "np", msdsn.ProtocolParsers[1].Protocol(), "np should be second protocol")
-	assert.EqualValuesf(t, "tcp", msdsn.ProtocolParsers[2].Protocol(), "tcp should be third protocol")
+	assert.EqualValuesf(t, "tcp", msdsn.ProtocolParsers[1].Protocol(), "tcp should be second protocol")
+	assert.EqualValuesf(t, "np", msdsn.ProtocolParsers[2].Protocol(), "np should be third protocol")
+
 }

pkg/sqlcmd/sqlcmd_windows_amd64.go

@@ -8,10 +8,11 @@ import (
 
 func init() {
 	if len(msdsn.ProtocolParsers) == 3 {
-		// reorder the protocol parsers to lpc->np->tcp
+		// reorder the protocol parsers to lpc->tcp->np
 		// ODBC follows this same order.
 		var tcp = msdsn.ProtocolParsers[0]
 		msdsn.ProtocolParsers[0] = msdsn.ProtocolParsers[2]
-		msdsn.ProtocolParsers[2] = tcp
+		msdsn.ProtocolParsers[2] = msdsn.ProtocolParsers[1]
+		msdsn.ProtocolParsers[1] = tcp
 	}
 }