From f7d3c4e151796f5e6e078093cd3c4fe796ffd55b Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Fri, 14 Apr 2017 17:11:39 -0500 Subject: [PATCH] Replace DATABASE_URL with PGX_TEST_DATABASE PGX_TEST_DATABASE is much less likely to collide with another environment variable. This is especially valuable when using direnv to automatically set environment variables. --- .travis.yml | 2 +- pgtype/testutil/testutil.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a60a324e..66815bb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_install: env: global: - - DATABASE_URL=postgres://pgx_md5:secret@127.0.0.1/pgx_test + - PGX_TEST_DATABASE=postgres://pgx_md5:secret@127.0.0.1/pgx_test matrix: - PGVERSION=9.6 - PGVERSION=9.5 diff --git a/pgtype/testutil/testutil.go b/pgtype/testutil/testutil.go index d9aaa5c4..6bf9f878 100644 --- a/pgtype/testutil/testutil.go +++ b/pgtype/testutil/testutil.go @@ -26,7 +26,7 @@ func MustConnectDatabaseSQL(t testing.TB, driverName string) *sql.DB { t.Fatalf("Unknown driver %v", driverName) } - db, err := sql.Open(sqlDriverName, os.Getenv("DATABASE_URL")) + db, err := sql.Open(sqlDriverName, os.Getenv("PGX_TEST_DATABASE")) if err != nil { t.Fatal(err) } @@ -35,7 +35,7 @@ func MustConnectDatabaseSQL(t testing.TB, driverName string) *sql.DB { } func MustConnectPgx(t testing.TB) *pgx.Conn { - config, err := pgx.ParseURI(os.Getenv("DATABASE_URL")) + config, err := pgx.ParseURI(os.Getenv("PGX_TEST_DATABASE")) if err != nil { t.Fatal(err) }