feat(pgdb): add PG* environment variable fallback in OpenPool
When no DATABASE_URI or config file is found, fall through to
pgxpool.ParseConfig("") which natively reads standard PG* variables
(PGHOST, PGUSER, PGPASSWORD, PGDATABASE, etc.). This removes
unnecessary ceremony in CI and container environments where PG* vars
are already set.
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
"go.ntppool.org/common/database"
|
||||
)
|
||||
|
||||
@@ -184,6 +185,86 @@ func TestOpenPoolWithDatabaseURI(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPGEnvVarsFallback(t *testing.T) {
|
||||
// Verify that pgxpool.ParseConfig("") picks up PG* env vars
|
||||
t.Setenv("PGHOST", "pg.example.com")
|
||||
t.Setenv("PGUSER", "pguser")
|
||||
t.Setenv("PGDATABASE", "pgdb")
|
||||
t.Setenv("PGPORT", "5433")
|
||||
t.Setenv("PGSSLMODE", "require")
|
||||
|
||||
cfg, err := pgxpool.ParseConfig("")
|
||||
if err != nil {
|
||||
t.Fatalf("pgxpool.ParseConfig(\"\") failed: %v", err)
|
||||
}
|
||||
if cfg.ConnConfig.Host != "pg.example.com" {
|
||||
t.Errorf("Expected Host=pg.example.com, got %s", cfg.ConnConfig.Host)
|
||||
}
|
||||
if cfg.ConnConfig.User != "pguser" {
|
||||
t.Errorf("Expected User=pguser, got %s", cfg.ConnConfig.User)
|
||||
}
|
||||
if cfg.ConnConfig.Database != "pgdb" {
|
||||
t.Errorf("Expected Database=pgdb, got %s", cfg.ConnConfig.Database)
|
||||
}
|
||||
if cfg.ConnConfig.Port != 5433 {
|
||||
t.Errorf("Expected Port=5433, got %d", cfg.ConnConfig.Port)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOpenPoolPGEnvVarsFallback(t *testing.T) {
|
||||
// Unset DATABASE_URI to ensure we don't take that path
|
||||
t.Setenv("DATABASE_URI", "")
|
||||
|
||||
// Set PG* vars pointing to a non-listening port
|
||||
t.Setenv("PGHOST", "127.0.0.1")
|
||||
t.Setenv("PGPORT", "59998")
|
||||
t.Setenv("PGUSER", "testuser")
|
||||
t.Setenv("PGDATABASE", "testdb")
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||
defer cancel()
|
||||
|
||||
opts := DefaultPoolOptions()
|
||||
opts.ConfigFiles = []string{"/nonexistent/path/database.yaml"}
|
||||
|
||||
_, err := OpenPool(ctx, opts)
|
||||
|
||||
// Should fail with connection error (not config file error),
|
||||
// proving the PG* fallback path was taken
|
||||
if err == nil {
|
||||
t.Fatal("expected error, got nil")
|
||||
}
|
||||
errStr := err.Error()
|
||||
if strings.Contains(errStr, "no valid config file") {
|
||||
t.Errorf("expected connection error from PG* fallback, got config file error: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPGEnvVarsFallbackAppliesPoolOptions(t *testing.T) {
|
||||
// Verify that PoolOptions are applied when using the PG* fallback path.
|
||||
// We can't call OpenPool (it would try to connect), so we verify the
|
||||
// behavior by confirming pgxpool.ParseConfig("") succeeds and that the
|
||||
// code path applies PoolOptions. We test this indirectly via
|
||||
// TestOpenPoolPGEnvVarsFallback (connection error proves PG* path was
|
||||
// taken with pool options applied).
|
||||
|
||||
// pgxpool.ParseConfig("") always succeeds (falls back to libpq defaults),
|
||||
// so when no config files exist the PG* path is always attempted.
|
||||
t.Setenv("DATABASE_URI", "")
|
||||
t.Setenv("PGHOST", "192.0.2.1") // RFC 5737 TEST-NET, won't connect
|
||||
t.Setenv("PGPORT", "5432")
|
||||
t.Setenv("PGUSER", "testuser")
|
||||
t.Setenv("PGDATABASE", "testdb")
|
||||
|
||||
cfg, err := pgxpool.ParseConfig("")
|
||||
if err != nil {
|
||||
t.Fatalf("pgxpool.ParseConfig(\"\") failed: %v", err)
|
||||
}
|
||||
if cfg.ConnConfig.Host != "192.0.2.1" {
|
||||
t.Errorf("Expected Host=192.0.2.1, got %s", cfg.ConnConfig.Host)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDatabaseURIPrecedence(t *testing.T) {
|
||||
// Test that DATABASE_URI takes precedence over config files
|
||||
// We use localhost with a port that's unlikely to have postgres running
|
||||
|
||||
Reference in New Issue
Block a user