From 1ec3816a20fbda617252909c2262bbaf5755836d Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 29 Oct 2022 13:23:25 -0500 Subject: [PATCH] pgconn and pgproto use same environment variable for tests as pgx --- .github/workflows/ci.yml | 7 -- pgconn/README.md | 6 +- pgconn/benchmark_test.go | 10 +-- pgconn/config_test.go | 2 +- pgconn/pgconn_stress_test.go | 2 +- pgconn/pgconn_test.go | 138 +++++++++++++++++------------------ pgproto3/trace_test.go | 2 +- 7 files changed, 80 insertions(+), 87 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a905ad3e..efe7989b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: include: - pg-version: 10 pgx-test-database: postgres://pgx_md5:secret@127.0.0.1/pgx_test - pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test" pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require @@ -27,7 +26,6 @@ jobs: pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test - pg-version: 11 pgx-test-database: postgres://pgx_md5:secret@127.0.0.1/pgx_test - pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test" pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require @@ -35,7 +33,6 @@ jobs: pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test - pg-version: 12 pgx-test-database: postgres://pgx_md5:secret@127.0.0.1/pgx_test - pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test" pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require @@ -43,7 +40,6 @@ jobs: pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test - pg-version: 13 pgx-test-database: postgres://pgx_md5:secret@127.0.0.1/pgx_test - pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test" pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require @@ -51,7 +47,6 @@ jobs: pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test - pg-version: 14 pgx-test-database: postgres://pgx_md5:secret@127.0.0.1/pgx_test - pgx-test-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-unix-socket-conn-string: "host=/var/run/postgresql dbname=pgx_test" pgx-test-tcp-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test pgx-test-tls-conn-string: postgres://pgx_md5:secret@127.0.0.1/pgx_test?sslmode=require @@ -59,7 +54,6 @@ jobs: pgx-test-plain-password-conn-string: postgres://pgx_pw:secret@127.0.0.1/pgx_test - pg-version: cockroachdb pgx-test-database: "postgresql://root@127.0.0.1:26257/pgx_test?sslmode=disable&experimental_enable_temp_tables=on" - pgx-test-conn-string: "postgresql://root@127.0.0.1:26257/pgx_test?sslmode=disable&experimental_enable_temp_tables=on" steps: @@ -80,7 +74,6 @@ jobs: run: go test -race ./... env: PGX_TEST_DATABASE: ${{ matrix.pgx-test-database }} - PGX_TEST_CONN_STRING: ${{ matrix.pgx-test-conn-string }} PGX_TEST_UNIX_SOCKET_CONN_STRING: ${{ matrix.pgx-test-unix-socket-conn-string }} PGX_TEST_TCP_CONN_STRING: ${{ matrix.pgx-test-tcp-conn-string }} PGX_TEST_TLS_CONN_STRING: ${{ matrix.pgx-test-tls-conn-string }} diff --git a/pgconn/README.md b/pgconn/README.md index 4f0349f2..f2109e39 100644 --- a/pgconn/README.md +++ b/pgconn/README.md @@ -26,8 +26,8 @@ if err != nil { ## Testing -The pgconn tests require a PostgreSQL database. It will connect to the database specified in the `PGX_TEST_CONN_STRING` -environment variable. The `PGX_TEST_CONN_STRING` environment variable can be a URL or DSN. In addition, the standard `PG*` +The pgconn tests require a PostgreSQL database. It will connect to the database specified in the `PGX_TEST_DATABASE` +environment variable. The `PGX_TEST_DATABASE` environment variable can be a URL or DSN. In addition, the standard `PG*` environment variables will be respected. Consider using [direnv](https://github.com/direnv/direnv) to simplify environment variable handling. @@ -42,7 +42,7 @@ create database pgx_test; Now you can run the tests: ```bash -PGX_TEST_CONN_STRING="host=/var/run/postgresql dbname=pgx_test" go test ./... +PGX_TEST_DATABASE="host=/var/run/postgresql dbname=pgx_test" go test ./... ``` ### Connection and Authentication Tests diff --git a/pgconn/benchmark_test.go b/pgconn/benchmark_test.go index ffa42243..8998d0f6 100644 --- a/pgconn/benchmark_test.go +++ b/pgconn/benchmark_test.go @@ -53,7 +53,7 @@ func BenchmarkExec(b *testing.B) { for _, bm := range benchmarks { bm := bm b.Run(bm.name, func(b *testing.B) { - conn, err := pgconn.Connect(bm.ctx, os.Getenv("PGX_TEST_CONN_STRING")) + conn, err := pgconn.Connect(bm.ctx, os.Getenv("PGX_TEST_DATABASE")) require.Nil(b, err) defer closeConn(b, conn) @@ -97,7 +97,7 @@ func BenchmarkExec(b *testing.B) { } func BenchmarkExecPossibleToCancel(b *testing.B) { - conn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + conn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.Nil(b, err) defer closeConn(b, conn) @@ -159,7 +159,7 @@ func BenchmarkExecPrepared(b *testing.B) { for _, bm := range benchmarks { bm := bm b.Run(bm.name, func(b *testing.B) { - conn, err := pgconn.Connect(bm.ctx, os.Getenv("PGX_TEST_CONN_STRING")) + conn, err := pgconn.Connect(bm.ctx, os.Getenv("PGX_TEST_DATABASE")) require.Nil(b, err) defer closeConn(b, conn) @@ -197,7 +197,7 @@ func BenchmarkExecPrepared(b *testing.B) { } func BenchmarkExecPreparedPossibleToCancel(b *testing.B) { - conn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + conn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.Nil(b, err) defer closeConn(b, conn) @@ -238,7 +238,7 @@ func BenchmarkExecPreparedPossibleToCancel(b *testing.B) { } // func BenchmarkChanToSetDeadlinePossibleToCancel(b *testing.B) { -// conn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) +// conn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) // require.Nil(b, err) // defer closeConn(b, conn) diff --git a/pgconn/config_test.go b/pgconn/config_test.go index 153488cc..ff5c8a76 100644 --- a/pgconn/config_test.go +++ b/pgconn/config_test.go @@ -810,7 +810,7 @@ func TestConfigCopyOriginalConfigDidNotChange(t *testing.T) { } func TestConfigCopyCanBeUsedToConnect(t *testing.T) { - connString := os.Getenv("PGX_TEST_CONN_STRING") + connString := os.Getenv("PGX_TEST_DATABASE") original, err := pgconn.ParseConfig(connString) require.NoError(t, err) diff --git a/pgconn/pgconn_stress_test.go b/pgconn/pgconn_stress_test.go index 3d72964f..1bfd9858 100644 --- a/pgconn/pgconn_stress_test.go +++ b/pgconn/pgconn_stress_test.go @@ -14,7 +14,7 @@ import ( ) func TestConnStress(t *testing.T) { - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) diff --git a/pgconn/pgconn_test.go b/pgconn/pgconn_test.go index 9b7eebde..abca5540 100644 --- a/pgconn/pgconn_test.go +++ b/pgconn/pgconn_test.go @@ -316,7 +316,7 @@ func TestConnectWithConnectionRefused(t *testing.T) { func TestConnectCustomDialer(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) dialed := false @@ -391,7 +391,7 @@ func TestConnectCustomLookupWithPort(t *testing.T) { func TestConnectWithRuntimeParams(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) config.RuntimeParams = map[string]string{ @@ -417,7 +417,7 @@ func TestConnectWithRuntimeParams(t *testing.T) { func TestConnectWithFallback(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) // Prepend current primary config to fallbacks @@ -450,7 +450,7 @@ func TestConnectWithFallback(t *testing.T) { func TestConnectWithValidateConnect(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) dialCount := 0 @@ -489,7 +489,7 @@ func TestConnectWithValidateConnect(t *testing.T) { func TestConnectWithValidateConnectTargetSessionAttrsReadWrite(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) config.ValidateConnect = pgconn.ValidateConnectTargetSessionAttrsReadWrite @@ -507,7 +507,7 @@ func TestConnectWithValidateConnectTargetSessionAttrsReadWrite(t *testing.T) { func TestConnectWithAfterConnect(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) config.AfterConnect = func(ctx context.Context, conn *pgconn.PgConn) error { @@ -536,7 +536,7 @@ func TestConnectConfigRequiresConfigFromParseConfig(t *testing.T) { func TestConnPrepareSyntaxError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -550,7 +550,7 @@ func TestConnPrepareSyntaxError(t *testing.T) { func TestConnPrepareContextPrecanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -568,7 +568,7 @@ func TestConnPrepareContextPrecanceled(t *testing.T) { func TestConnExec(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -587,7 +587,7 @@ func TestConnExec(t *testing.T) { func TestConnExecEmpty(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -608,7 +608,7 @@ func TestConnExecEmpty(t *testing.T) { func TestConnExecMultipleQueries(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -633,7 +633,7 @@ func TestConnExecMultipleQueries(t *testing.T) { func TestConnExecMultipleQueriesEagerFieldDescriptions(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -661,7 +661,7 @@ func TestConnExecMultipleQueriesEagerFieldDescriptions(t *testing.T) { func TestConnExecMultipleQueriesError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -692,7 +692,7 @@ func TestConnExecMultipleQueriesError(t *testing.T) { func TestConnExecDeferredError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -724,7 +724,7 @@ func TestConnExecDeferredError(t *testing.T) { func TestConnExecContextCanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -748,7 +748,7 @@ func TestConnExecContextCanceled(t *testing.T) { func TestConnExecContextPrecanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -765,7 +765,7 @@ func TestConnExecContextPrecanceled(t *testing.T) { func TestConnExecParams(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -789,7 +789,7 @@ func TestConnExecParams(t *testing.T) { func TestConnExecParamsDeferredError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -820,7 +820,7 @@ func TestConnExecParamsDeferredError(t *testing.T) { func TestConnExecParamsMaxNumberOfParams(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -843,7 +843,7 @@ func TestConnExecParamsMaxNumberOfParams(t *testing.T) { func TestConnExecParamsTooManyParams(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -866,7 +866,7 @@ func TestConnExecParamsTooManyParams(t *testing.T) { func TestConnExecParamsCanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -894,7 +894,7 @@ func TestConnExecParamsCanceled(t *testing.T) { func TestConnExecParamsPrecanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -914,7 +914,7 @@ func TestConnExecParamsEmptySQL(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) defer cancel() - pgConn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -930,7 +930,7 @@ func TestConnExecParamsEmptySQL(t *testing.T) { func TestResultReaderValuesHaveSameCapacityAsLength(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -955,7 +955,7 @@ func TestResultReaderValuesHaveSameCapacityAsLength(t *testing.T) { func TestConnExecPrepared(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -985,7 +985,7 @@ func TestConnExecPrepared(t *testing.T) { func TestConnExecPreparedMaxNumberOfParams(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1014,7 +1014,7 @@ func TestConnExecPreparedMaxNumberOfParams(t *testing.T) { func TestConnExecPreparedTooManyParams(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1048,7 +1048,7 @@ func TestConnExecPreparedTooManyParams(t *testing.T) { func TestConnExecPreparedCanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1077,7 +1077,7 @@ func TestConnExecPreparedCanceled(t *testing.T) { func TestConnExecPreparedPrecanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1100,7 +1100,7 @@ func TestConnExecPreparedEmptySQL(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), time.Second*5) defer cancel() - pgConn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1118,7 +1118,7 @@ func TestConnExecPreparedEmptySQL(t *testing.T) { func TestConnExecBatch(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1150,7 +1150,7 @@ func TestConnExecBatch(t *testing.T) { func TestConnExecBatchDeferredError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1184,7 +1184,7 @@ func TestConnExecBatchDeferredError(t *testing.T) { func TestConnExecBatchPrecanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1217,7 +1217,7 @@ func TestConnExecBatchHuge(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1245,7 +1245,7 @@ func TestConnExecBatchHuge(t *testing.T) { func TestConnExecBatchImplicitTransaction(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1272,7 +1272,7 @@ func TestConnExecBatchImplicitTransaction(t *testing.T) { func TestConnLocking(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1296,7 +1296,7 @@ func TestConnLocking(t *testing.T) { func TestConnOnNotice(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) var msg string @@ -1327,7 +1327,7 @@ end$$;`) func TestConnOnNotification(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) var msg string @@ -1363,7 +1363,7 @@ func TestConnOnNotification(t *testing.T) { func TestConnWaitForNotification(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) var msg string @@ -1399,7 +1399,7 @@ func TestConnWaitForNotification(t *testing.T) { func TestConnWaitForNotificationPrecanceled(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) pgConn, err := pgconn.ConnectConfig(context.Background(), config) @@ -1417,7 +1417,7 @@ func TestConnWaitForNotificationPrecanceled(t *testing.T) { func TestConnWaitForNotificationTimeout(t *testing.T) { t.Parallel() - config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_CONN_STRING")) + config, err := pgconn.ParseConfig(os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) pgConn, err := pgconn.ConnectConfig(context.Background(), config) @@ -1436,7 +1436,7 @@ func TestConnWaitForNotificationTimeout(t *testing.T) { func TestConnCopyToSmall(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1478,7 +1478,7 @@ func TestConnCopyToSmall(t *testing.T) { func TestConnCopyToLarge(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1520,7 +1520,7 @@ func TestConnCopyToLarge(t *testing.T) { func TestConnCopyToQueryError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1537,7 +1537,7 @@ func TestConnCopyToQueryError(t *testing.T) { func TestConnCopyToCanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1564,7 +1564,7 @@ func TestConnCopyToCanceled(t *testing.T) { func TestConnCopyToPrecanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1584,7 +1584,7 @@ func TestConnCopyToPrecanceled(t *testing.T) { func TestConnCopyFrom(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1624,7 +1624,7 @@ func TestConnCopyFrom(t *testing.T) { func TestConnCopyFromCanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1668,7 +1668,7 @@ func TestConnCopyFromCanceled(t *testing.T) { func TestConnCopyFromPrecanceled(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1705,7 +1705,7 @@ func TestConnCopyFromPrecanceled(t *testing.T) { func TestConnCopyFromGzipReader(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1766,7 +1766,7 @@ func TestConnCopyFromGzipReader(t *testing.T) { func TestConnCopyFromQuerySyntaxError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1800,7 +1800,7 @@ func TestConnCopyFromQuerySyntaxError(t *testing.T) { func TestConnCopyFromQueryNoTableError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1819,7 +1819,7 @@ func TestConnCopyFromNoticeResponseReceivedMidStream(t *testing.T) { t.Parallel() ctx := context.Background() - pgConn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1906,7 +1906,7 @@ func TestConnCopyFromDataWriteAfterErrorAndReturn(t *testing.T) { func TestConnEscapeString(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1934,7 +1934,7 @@ func TestConnEscapeString(t *testing.T) { func TestConnCancelRequest(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1967,7 +1967,7 @@ func TestConnCancelRequest(t *testing.T) { func TestConnContextCanceledCancelsRunningQueryOnServer(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -1988,7 +1988,7 @@ func TestConnContextCanceledCancelsRunningQueryOnServer(t *testing.T) { t.Fatal("Connection cleanup exceeded maximum time") } - otherConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + otherConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, otherConn) @@ -2014,7 +2014,7 @@ func TestConnContextCanceledCancelsRunningQueryOnServer(t *testing.T) { func TestHijackAndConstruct(t *testing.T) { t.Parallel() - origConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + origConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) hc, err := origConn.Hijack() @@ -2043,7 +2043,7 @@ func TestHijackAndConstruct(t *testing.T) { func TestConnCloseWhileCancellableQueryInProgress(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) ctx, _ := context.WithCancel(context.Background()) @@ -2127,7 +2127,7 @@ func TestFatalErrorReceivedAfterCommandComplete(t *testing.T) { func TestConnLargeResponseWhileWritingDoesNotDeadlock(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2191,7 +2191,7 @@ func TestConnCheckConn(t *testing.T) { func TestPipelinePrepare(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2263,7 +2263,7 @@ func TestPipelinePrepare(t *testing.T) { func TestPipelinePrepareError(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2305,7 +2305,7 @@ func TestPipelinePrepareError(t *testing.T) { func TestPipelinePrepareAndDeallocate(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2346,7 +2346,7 @@ func TestPipelinePrepareAndDeallocate(t *testing.T) { func TestPipelineQuery(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2435,7 +2435,7 @@ func TestPipelineQuery(t *testing.T) { func TestPipelinePrepareQuery(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2492,7 +2492,7 @@ func TestPipelinePrepareQuery(t *testing.T) { func TestPipelineQueryErrorBetweenSyncs(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2596,7 +2596,7 @@ func TestPipelineQueryErrorBetweenSyncs(t *testing.T) { func TestPipelineCloseReadsUnreadResults(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2631,7 +2631,7 @@ func TestPipelineCloseReadsUnreadResults(t *testing.T) { func TestPipelineCloseDetectsUnsyncedRequests(t *testing.T) { t.Parallel() - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer closeConn(t, pgConn) @@ -2660,7 +2660,7 @@ func TestPipelineCloseDetectsUnsyncedRequests(t *testing.T) { } func Example() { - pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_CONN_STRING")) + pgConn, err := pgconn.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE")) if err != nil { log.Fatalln(err) } diff --git a/pgproto3/trace_test.go b/pgproto3/trace_test.go index 904bbdfb..f466691f 100644 --- a/pgproto3/trace_test.go +++ b/pgproto3/trace_test.go @@ -18,7 +18,7 @@ func TestTrace(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - conn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_CONN_STRING")) + conn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_DATABASE")) require.NoError(t, err) defer conn.Close(ctx)