fix(test): put session_id after version check

Author: SpencerTorres

tests/std/connect_check_test.go

@@ -44,20 +44,20 @@ func TestStdConnCheck(t *testing.T) {
 	require.NoError(t, err)
 
 	dsns := map[clickhouse.Protocol]string{clickhouse.Native: fmt.Sprintf("clickhouse://%s:%d?username=%s&password=%s", env.Host, env.Port, env.Username, env.Password),
-		clickhouse.HTTP: fmt.Sprintf("http://%s:%d?username=%s&password=%s&session_id=conn_test_session", env.Host, env.HttpPort, env.Username, env.Password)}
+		clickhouse.HTTP: fmt.Sprintf("http://%s:%d?username=%s&password=%s", env.Host, env.HttpPort, env.Username, env.Password)}
 	useSSL, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_SSL", "false"))
 	require.NoError(t, err)
 	if useSSL {
 		dsns = map[clickhouse.Protocol]string{clickhouse.Native: fmt.Sprintf("clickhouse://%s:%d?username=%s&password=%s&secure=true", env.Host, env.SslPort, env.Username, env.Password),
-			clickhouse.HTTP: fmt.Sprintf("https://%s:%d?username=%s&password=%s&session_id=conn_test_session&secure=true", env.Host, env.HttpsPort, env.Username, env.Password)}
+			clickhouse.HTTP: fmt.Sprintf("https://%s:%d?username=%s&password=%s&secure=true", env.Host, env.HttpsPort, env.Username, env.Password)}
 	}
 	for name, dsn := range dsns {
 		if name == clickhouse.Native && useSSL {
 			//TODO: test fails over native and SSL - requires investigation
 			continue
 		}
 		t.Run(fmt.Sprintf("%s Protocol", name), func(t *testing.T) {
-			connect, err := GetConnectionFromDSN(dsn)
+			connect, err := GetConnectionFromDSNWithSessionID(dsn, "conn_test_session")
 			require.NoError(t, err)
 			// We can only change the settings at the connection level.
 			// If we have only one connection, we change the settings specifically for that connection.

tests/std/utils.go

@@ -117,6 +117,10 @@ func GetDSNConnection(environment string, protocol clickhouse.Protocol, secure b
 }
 
 func GetConnectionFromDSN(dsn string) (*sql.DB, error) {
+	return GetConnectionFromDSNWithSessionID(dsn, "")
+}
+
+func GetConnectionFromDSNWithSessionID(dsn string, sessionID string) (*sql.DB, error) {
 	conn, err := sql.Open("clickhouse", dsn)
 	if err != nil {
 		return conn, err
@@ -134,6 +138,12 @@ func GetConnectionFromDSN(dsn string) (*sql.DB, error) {
 	if strings.HasPrefix(dsn, "http") {
 		dsn = fmt.Sprintf("%s&wait_end_of_query=1", dsn)
 	}
+
+	// Optionally provide session ID after initial version check to prevent locking
+	if len(sessionID) > 0 {
+		dsn = fmt.Sprintf("%s&session_id=%s", dsn, sessionID)
+	}
+
 	return sql.Open("clickhouse", dsn)
 }
 

tests/std/uuid_test.go

@@ -34,15 +34,15 @@ func TestStdUUID(t *testing.T) {
 	useSSL, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_SSL", "false"))
 	require.NoError(t, err)
 	dsns := map[string]string{"Native": fmt.Sprintf("clickhouse://%s:%d?username=%s&password=%s", env.Host, env.Port, env.Username, env.Password),
-		"Http": fmt.Sprintf("http://%s:%d?username=%s&password=%s&session_id=uuid_test_session", env.Host, env.HttpPort, env.Username, env.Password)}
+		"Http": fmt.Sprintf("http://%s:%d?username=%s&password=%s", env.Host, env.HttpPort, env.Username, env.Password)}
 	if useSSL {
 		dsns = map[string]string{"Native": fmt.Sprintf("clickhouse://%s:%d?username=%s&password=%s&secure=true", env.Host, env.SslPort, env.Username, env.Password),
-			"Http": fmt.Sprintf("https://%s:%d?username=%s&password=%s&session_id=uuid_test_session&secure=true", env.Host, env.HttpsPort, env.Username, env.Password)}
+			"Http": fmt.Sprintf("https://%s:%d?username=%s&password=%s&secure=true", env.Host, env.HttpsPort, env.Username, env.Password)}
 	}
 
 	for name, dsn := range dsns {
 		t.Run(fmt.Sprintf("%s Protocol", name), func(t *testing.T) {
-			conn, err := GetConnectionFromDSN(dsn)
+			conn, err := GetConnectionFromDSNWithSessionID(dsn, "uuid_test_session")
 			require.NoError(t, err)
 
 			const ddl = `
@@ -86,14 +86,14 @@ func TestStdNullableUUID(t *testing.T) {
 	useSSL, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_SSL", "false"))
 	require.NoError(t, err)
 	dsns := map[string]string{"Native": fmt.Sprintf("clickhouse://%s:%d?username=%s&password=%s", env.Host, env.Port, env.Username, env.Password),
-		"Http": fmt.Sprintf("http://%s:%d?username=%s&password=%s&session_id=nullable_uuid_test_session", env.Host, env.HttpPort, env.Username, env.Password)}
+		"Http": fmt.Sprintf("http://%s:%d?username=%s&password=%s", env.Host, env.HttpPort, env.Username, env.Password)}
 	if useSSL {
 		dsns = map[string]string{"Native": fmt.Sprintf("clickhouse://%s:%d?username=%s&password=%s&secure=true", env.Host, env.SslPort, env.Username, env.Password),
-			"Http": fmt.Sprintf("https://%s:%d?username=%s&password=%s&session_id=nullable_uuid_test_session&secure=true", env.Host, env.HttpsPort, env.Username, env.Password)}
+			"Http": fmt.Sprintf("https://%s:%d?username=%s&password=%s&secure=true", env.Host, env.HttpsPort, env.Username, env.Password)}
 	}
 	for name, dsn := range dsns {
 		t.Run(fmt.Sprintf("%s Protocol", name), func(t *testing.T) {
-			conn, err := GetConnectionFromDSN(dsn)
+			conn, err := GetConnectionFromDSNWithSessionID(dsn, "nullable_uuid_test_session")
 			require.NoError(t, err)
 
 			const ddl = `