From d9a80caaad0dbdf274cc0fc96729adaa2d02e1f9 Mon Sep 17 00:00:00 2001 From: Kris Wehner Date: Thu, 5 Jan 2017 12:50:42 -0800 Subject: [PATCH] The naming really matters --- conn_config_test.go.example | 2 +- conn_config_test.go.travis | 7 +++---- replication_test.go | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/conn_config_test.go.example b/conn_config_test.go.example index 6deedd90..cac798b7 100644 --- a/conn_config_test.go.example +++ b/conn_config_test.go.example @@ -14,7 +14,7 @@ var plainPasswordConnConfig *pgx.ConnConfig = nil var invalidUserConnConfig *pgx.ConnConfig = nil var tlsConnConfig *pgx.ConnConfig = nil var customDialerConnConfig *pgx.ConnConfig = nil -var replicationConfig *pgx.ConnConfig = nil +var replicationConnConfig *pgx.ConnConfig = nil // var tcpConnConfig *pgx.ConnConfig = &pgx.ConnConfig{Host: "127.0.0.1", User: "pgx_md5", Password: "secret", Database: "pgx_test"} // var unixSocketConnConfig *pgx.ConnConfig = &pgx.ConnConfig{Host: "/private/tmp", User: "pgx_none", Database: "pgx_test"} diff --git a/conn_config_test.go.travis b/conn_config_test.go.travis index 564d704c..5ad7525d 100644 --- a/conn_config_test.go.travis +++ b/conn_config_test.go.travis @@ -15,13 +15,12 @@ var plainPasswordConnConfig = &pgx.ConnConfig{Host: "127.0.0.1", User: "pgx_pw", var invalidUserConnConfig = &pgx.ConnConfig{Host: "127.0.0.1", User: "invalid", Database: "pgx_test"} var tlsConnConfig = &pgx.ConnConfig{Host: "127.0.0.1", User: "pgx_ssl", Password: "secret", Database: "pgx_test", TLSConfig: &tls.Config{InsecureSkipVerify: true}} var customDialerConnConfig = &pgx.ConnConfig{Host: "127.0.0.1", User: "pgx_md5", Password: "secret", Database: "pgx_test"} -var pgVersion string -var replicationConfig *pgx.ConnConfig = nil +var replicationConnConfig *pgx.ConnConfig = nil -pgVersion = os.getenv("PGVERSION") +pgVersion := os.getenv("PGVERSION") if len(pgVersion) > 0 { version, err := strconv.ParseFloat(pgVersion) if err == nil && version >= 9.6 { - replicationConfig = &pgx.ConnConfig{Host: "127.0.0.1", User: "pgx_replication", Password: "secret", Database: "pgx_test"} + replicationConnConfig = &pgx.ConnConfig{Host: "127.0.0.1", User: "pgx_replication", Password: "secret", Database: "pgx_test"} } } diff --git a/replication_test.go b/replication_test.go index 789bb27d..866fe45e 100644 --- a/replication_test.go +++ b/replication_test.go @@ -40,15 +40,12 @@ func TestSimpleReplicationConnection(t *testing.T) { t.Parallel() var err error - var replicationUserConfig pgx.ConnConfig - // /.s.PGSQL.5432 if replicationConnConfig == nil { t.Skip("Skipping due to undefined replicationConnConfig") } - replicationUserConfig = *replicationConnConfig - conn := mustConnect(t, replicationUserConfig) + conn := mustConnect(t, *replicationConnConfig) defer closeConn(t, conn) replicationConnConfig.RuntimeParams = make(map[string]string)