Construct DNS for Postgres in more deterministic way

.golangci.yml

@@ -71,6 +71,7 @@ issues:
       linters:
         - dogsled
         - dupl
+        - errcheck
         - funlen
         - goconst
         - gocritic

dsn.go

@@ -8,6 +8,8 @@ package dbkit
 
 import (
 	"fmt"
+	"sort"
+	"strings"
 
 	"net/url"
 
@@ -60,8 +62,13 @@ func MakePostgresDSN(cfg *PostgresConfig) string {
 	if cfg.SearchPath != "" {
 		connURI.RawQuery += fmt.Sprintf("&search_path=%s", url.QueryEscape(cfg.SearchPath))
 	}
-	for k, v := range cfg.AdditionalParameters {
-		connURI.RawQuery += fmt.Sprintf("&%s=%s", k, url.QueryEscape(v))
+	if len(cfg.AdditionalParameters) != 0 {
+		queryParts := make([]string, 0, len(cfg.AdditionalParameters))
+		for k, v := range cfg.AdditionalParameters {
+			queryParts = append(queryParts, fmt.Sprintf("%s=%s", k, url.QueryEscape(v)))
+		}
+		sort.Strings(queryParts) // Sort to make DSN deterministic.
+		connURI.RawQuery += "&" + strings.Join(queryParts, "&")
 	}
 	return connURI.String()
 }

dsn_test.go

@@ -26,6 +26,48 @@ func TestMakeMySQLDSN(t *testing.T) {
 	require.Equal(t, wantDSN, gotDSN)
 }
 
+func TestMakePostgresDSN(t *testing.T) {
+	tests := []struct {
+		Name    string
+		Cfg     *PostgresConfig
+		WantDSN string
+	}{
+		{
+			Name: "search_path is used",
+			Cfg: &PostgresConfig{
+				Host:                 "pghost",
+				Port:                 5433,
+				User:                 "pgadmin",
+				Password:             "pgpassword",
+				Database:             "pgdb",
+				SSLMode:              PostgresSSLModeRequire,
+				SearchPath:           "pgsearch",
+				AdditionalParameters: map[string]string{"param1": "foo", "param2": "bar"},
+			},
+			WantDSN: "postgres://pgadmin:pgpassword@pghost:5433/pgdb?sslmode=require&search_path=pgsearch&param1=foo&param2=bar",
+		},
+		{
+			Name: "base",
+			Cfg: &PostgresConfig{
+				Host:                 "pghost",
+				Port:                 5433,
+				User:                 "pgadmin",
+				Password:             "pgpassword",
+				Database:             "pgdb",
+				SSLMode:              PostgresSSLModeRequire,
+				AdditionalParameters: map[string]string{"param1": "Lorem ipsum"},
+			},
+			WantDSN: "postgres://pgadmin:pgpassword@pghost:5433/pgdb?sslmode=require&param1=Lorem+ipsum",
+		},
+	}
+	for i := range tests {
+		tt := tests[i]
+		t.Run(tt.Name, func(t *testing.T) {
+			require.Equal(t, MakePostgresDSN(tt.Cfg), tt.WantDSN)
+		})
+	}
+}
+
 func TestMakePgSQLDSN(t *testing.T) {
 	cfg := &PostgresConfig{
 		Host:             "myhost",

pgx/pgx_test.go

@@ -21,48 +21,6 @@ import (
 	"github.com/acronis/go-dbkit/internal/testing"
 )
 
-func TestMakePostgresDSN(t *gotesting.T) {
-	tests := []struct {
-		Name    string
-		Cfg     *dbkit.PostgresConfig
-		WantDSN string
-	}{
-		{
-			Name: "search_path is used",
-			Cfg: &dbkit.PostgresConfig{
-				Host:                 "pghost",
-				Port:                 5433,
-				User:                 "pgadmin",
-				Password:             "pgpassword",
-				Database:             "pgdb",
-				SSLMode:              dbkit.PostgresSSLModeRequire,
-				SearchPath:           "pgsearch",
-				AdditionalParameters: map[string]string{"param1": "foo", "param2": "bar"},
-			},
-			WantDSN: "postgres://pgadmin:pgpassword@pghost:5433/pgdb?sslmode=require&search_path=pgsearch&param1=foo&param2=bar",
-		},
-		{
-			Name: "base",
-			Cfg: &dbkit.PostgresConfig{
-				Host:                 "pghost",
-				Port:                 5433,
-				User:                 "pgadmin",
-				Password:             "pgpassword",
-				Database:             "pgdb",
-				SSLMode:              dbkit.PostgresSSLModeRequire,
-				AdditionalParameters: map[string]string{"param1": "Lorem ipsum"},
-			},
-			WantDSN: "postgres://pgadmin:pgpassword@pghost:5433/pgdb?sslmode=require&param1=Lorem+ipsum",
-		},
-	}
-	for i := range tests {
-		tt := tests[i]
-		t.Run(tt.Name, func(t *gotesting.T) {
-			require.Equal(t, dbkit.MakePostgresDSN(tt.Cfg), tt.WantDSN)
-		})
-	}
-}
-
 func TestPostgresIsRetryable(t *gotesting.T) {
 	isRetryable := dbkit.GetIsRetryable(&pg.Driver{})
 	require.NotNil(t, isRetryable)

postgres/postgres_test.go

@@ -17,46 +17,6 @@ import (
 	"github.com/acronis/go-dbkit"
 )
 
-func TestMakePostgresDSN(t *testing.T) {
-	tests := []struct {
-		Name    string
-		Cfg     *dbkit.PostgresConfig
-		WantDSN string
-	}{
-		{
-			Name: "search_path is used",
-			Cfg: &dbkit.PostgresConfig{
-				Host:       "pghost",
-				Port:       5433,
-				User:       "pgadmin",
-				Password:   "pgpassword",
-				Database:   "pgdb",
-				SSLMode:    dbkit.PostgresSSLModeRequire,
-				SearchPath: "pgsearch",
-			},
-			WantDSN: "postgres://pgadmin:pgpassword@pghost:5433/pgdb?sslmode=require&search_path=pgsearch",
-		},
-		{
-			Name: "base",
-			Cfg: &dbkit.PostgresConfig{
-				Host:     "pghost",
-				Port:     5433,
-				User:     "pgadmin",
-				Password: "pgpassword",
-				Database: "pgdb",
-				SSLMode:  dbkit.PostgresSSLModeRequire,
-			},
-			WantDSN: "postgres://pgadmin:pgpassword@pghost:5433/pgdb?sslmode=require",
-		},
-	}
-	for i := range tests {
-		tt := tests[i]
-		t.Run(tt.Name, func(t *testing.T) {
-			require.Equal(t, dbkit.MakePostgresDSN(tt.Cfg), tt.WantDSN)
-		})
-	}
-}
-
 func TestPostgresIsRetryable(t *testing.T) {
 	isRetryable := dbkit.GetIsRetryable(&pg.Driver{})
 	require.NotNil(t, isRetryable)