From f17e8f33f781ce156ee73e8e7b6d104fcfa9c811 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 26 Jan 2021 16:42:13 -0300 Subject: [PATCH] Report the true database name on connection errors When reporting connection errors, we might show a database name in the message that's not the one we actually tried to connect to, if the database was taken from libpq defaults instead of from user parameters. Fix such error messages to use PQdb(), which reports the correct name. (But, per commit 2930c05634bc, make sure not to try to print NULL.) Apply to branches 9.5 through 13. Branch master has already been changed differently by commit 58cd8dca3de0. Reported-by: Robert Haas Discussion: https://postgr.es/m/CA+TgmobssJ6rS22dspWnu-oDxXevGmhMD8VcRBjmj-b9UDqRjw@mail.gmail.com --- contrib/oid2name/oid2name.c | 4 ++-- contrib/vacuumlo/vacuumlo.c | 2 +- src/bin/pg_dump/pg_dumpall.c | 2 +- src/bin/pgbench/pgbench.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index 91b7958c48..60972fea71 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -348,8 +348,8 @@ sql_conn(struct options *my_opts) /* check to see that the backend connection was successfully made */ if (PQstatus(conn) == CONNECTION_BAD) { - pg_log_error("could not connect to database %s: %s", - my_opts->dbname, PQerrorMessage(conn)); + pg_log_error("could not connect to database \"%s\": %s", + PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn)); PQfinish(conn); exit(1); } diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index e4019fafaa..0641885439 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -129,7 +129,7 @@ vacuumlo(const char *database, const struct _param *param) if (PQstatus(conn) == CONNECTION_BAD) { pg_log_error("connection to database \"%s\" failed: %s", - database, PQerrorMessage(conn)); + PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn)); PQfinish(conn); return -1; } diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 2c82b39af0..0bc74da9cf 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -1773,7 +1773,7 @@ connectDatabase(const char *dbname, const char *connection_string, if (fail_on_error) { pg_log_error("could not connect to database \"%s\": %s", - dbname, PQerrorMessage(conn)); + PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn)); exit_nicely(1); } else diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 768218565d..84e3aa9ece 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -1228,7 +1228,7 @@ doConnect(void) if (PQstatus(conn) == CONNECTION_BAD) { pg_log_error("connection to database \"%s\" failed: %s", - dbName, PQerrorMessage(conn)); + PQdb(conn), PQerrorMessage(conn)); PQfinish(conn); return NULL; } @@ -6047,7 +6047,7 @@ main(int argc, char **argv) if (PQstatus(con) == CONNECTION_BAD) { pg_log_fatal("connection to database \"%s\" failed: %s", - dbName, PQerrorMessage(con)); + PQdb(con) ? PQdb(con) : "", PQerrorMessage(con)); exit(1); }