PMM-12551 Fix for new connection string format.

percona · Mar 21, 2024 · 2d55e0b · 2d55e0b
1 parent 05c74f6
commit 2d55e0b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/managed/services/telemetry/telemetry_test.go b/managed/services/telemetry/telemetry_test.go
@@ -50,7 +50,7 @@ func TestRunTelemetryService(t *testing.T) {
 	if ok {
 		pgHostPort = pgHostPortFromEnv
 	}
-	qanDSN := "tcp://localhost:9000?database=pmm"
+	qanDSN := "tcp://localhost:9000/pmm"
 	qanDSNFromEnv, ok := os.LookupEnv(envQanDSN)
 	if ok {
 		qanDSN = qanDSNFromEnv

diff --git a/qan-api2/db_test.go b/qan-api2/db_test.go
@@ -39,9 +39,9 @@ func setup() *sqlx.DB {
 	}
 
 	dsn, ok := os.LookupEnv("QANAPI_DSN_TEST")
-	dsn = strings.Replace(dsn, "?database=pmm_test", "?database=pmm_test_parts", 1)
+	dsn = strings.Replace(dsn, "/pmm_test", "/pmm_test_parts", 1)
 	if !ok {
-		dsn = "clickhouse://127.0.0.1:19000?database=pmm_test_parts"
+		dsn = "clickhouse://127.0.0.1:19000/pmm_test_parts"
 	}
 	db, err := sqlx.Connect("clickhouse", dsn)
 	if err != nil {
@@ -113,9 +113,9 @@ func TestCreateDbIfNotExists(t *testing.T) {
 	t.Run("connect to db that doesnt exist", func(t *testing.T) {
 		dsn, ok := os.LookupEnv("QANAPI_DSN_TEST")
 
-		dsn = strings.Replace(dsn, "?database=pmm_test", "?database=pmm_created_db", 1)
+		dsn = strings.Replace(dsn, "/pmm_test", "/pmm_created_db", 1)
 		if !ok {
-			dsn = "clickhouse://127.0.0.1:19000?database=pmm_created_db"
+			dsn = "clickhouse://127.0.0.1:19000/pmm_created_db"
 		}
 
 		db := createDB(dsn)

diff --git a/qan-api2/main.go b/qan-api2/main.go
@@ -61,7 +61,7 @@ import (
 
 const (
 	shutdownTimeout = 3 * time.Second
-	defaultDsnF     = "clickhouse://%s?database=%s&block_size=%s&pool_size=%s"
+	defaultDsnF     = "clickhouse://%s/%s?block_size=%s&pool_size=%s"
 	maxIdleConns    = 5
 	maxOpenConns    = 10
 )

diff --git a/qan-api2/services/analytics/filters_test.go b/qan-api2/services/analytics/filters_test.go
@@ -54,7 +54,7 @@ type testValuesUnmarshal struct {
 func TestService_GetFilters(t *testing.T) {
 	dsn, ok := os.LookupEnv("QANAPI_DSN_TEST")
 	if !ok {
-		dsn = "clickhouse://127.0.0.1:19000?database=pmm_test"
+		dsn = "clickhouse://127.0.0.1:19000/pmm_test"
 	}
 	db, err := sqlx.Connect("clickhouse", dsn)
 	if err != nil {

diff --git a/qan-api2/services/analytics/profile_test.go b/qan-api2/services/analytics/profile_test.go
@@ -38,7 +38,7 @@ import (
 func setup() *sqlx.DB {
 	dsn, ok := os.LookupEnv("QANAPI_DSN_TEST")
 	if !ok {
-		dsn = "clickhouse://127.0.0.1:19000?database=pmm_test"
+		dsn = "clickhouse://127.0.0.1:19000/pmm_test"
 	}
 	db, err := sqlx.Connect("clickhouse", dsn)
 	if err != nil {