Fix building of connection string parameters (#47)

Author: mcwarman

postgresql/config.go

@@ -196,7 +196,7 @@ func (c *Config) connParams() []string {
 
 	paramsArray := []string{}
 	for key, value := range params {
-		paramsArray = append(paramsArray, "%s=%s", key, url.QueryEscape(value))
+		paramsArray = append(paramsArray, fmt.Sprintf("%s=%s", key, url.QueryEscape(value)))
 	}
 
 	return paramsArray

postgresql/config_test.go

@@ -0,0 +1,69 @@
+package postgresql
+
+import (
+	"reflect"
+	"sort"
+	"strings"
+	"testing"
+
+	"github.com/blang/semver"
+)
+
+func TestConfigConnParams(t *testing.T) {
+	var tests = []struct {
+		input *Config
+		want  []string
+	}{
+		{&Config{ConnectTimeoutSec: 10}, []string{"connect_timeout=10"}},
+		{&Config{Scheme: "postgres", SSLMode: "disable"}, []string{"connect_timeout=0", "sslmode=disable"}},
+		{&Config{Scheme: "awspostgres", SSLMode: "disable"}, []string{"connect_timeout=0"}},
+		{&Config{ExpectedVersion: semver.MustParse("9.0.0"), ApplicationName: "Terraform provider"}, []string{"connect_timeout=0", "fallback_application_name=Terraform+provider"}},
+		{&Config{ExpectedVersion: semver.MustParse("8.0.0"), ApplicationName: "Terraform provider"}, []string{"connect_timeout=0"}},
+		{&Config{SSLClientCert: &ClientCertificateConfig{CertificatePath: "/path/to/public-certificate.pem", KeyPath: "/path/to/private-key.pem"}}, []string{"connect_timeout=0", "sslcert=%2Fpath%2Fto%2Fpublic-certificate.pem", "sslkey=%2Fpath%2Fto%2Fprivate-key.pem"}},
+		{&Config{SSLRootCertPath: "/path/to/root.pem"}, []string{"connect_timeout=0", "sslrootcert=%2Fpath%2Fto%2Froot.pem"}},
+	}
+
+	for _, test := range tests {
+
+		connParams := test.input.connParams()
+
+		sort.Strings(connParams)
+		sort.Strings(test.want)
+
+		if !reflect.DeepEqual(connParams, test.want) {
+			t.Errorf("Config.connParams(%+v) returned %#v, want %#v", test.input, connParams, test.want)
+		}
+
+	}
+}
+
+func TestConfigConnStr(t *testing.T) {
+	var tests = []struct {
+		input        *Config
+		wantDbURL    string
+		wantDbParams []string
+	}{
+		{&Config{Scheme: "postgres", Host: "localhost", Port: 5432, Username: "postgres_user", Password: "postgres_password", SSLMode: "disable"}, "postgres://postgres_user:postgres_password@localhost:5432/postgres", []string{"connect_timeout=0", "sslmode=disable"}},
+	}
+
+	for _, test := range tests {
+
+		connStr := test.input.connStr("postgres")
+
+		splitConnStr := strings.Split(connStr, "?")
+
+		if splitConnStr[0] != test.wantDbURL {
+			t.Errorf("Config.connStr(%+v) returned %#v, want %#v", test.input, splitConnStr[0], test.wantDbURL)
+		}
+
+		connParams := strings.Split(splitConnStr[1], "&")
+
+		sort.Strings(connParams)
+		sort.Strings(test.wantDbParams)
+
+		if !reflect.DeepEqual(connParams, test.wantDbParams) {
+			t.Errorf("Config.connStr(%+v) returned %#v, want %#v", test.input, connParams, test.wantDbParams)
+		}
+
+	}
+}