diff options
| -rw-r--r-- | contrib/oid2name/oid2name.c | 2 | ||||
| -rw-r--r-- | contrib/vacuumlo/vacuumlo.c | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dumpall.c | 2 | ||||
| -rw-r--r-- | src/bin/pgbench/pgbench.c | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index 769e527384c..cb2dae52d66 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -320,7 +320,7 @@ sql_conn(struct options *my_opts) if (PQstatus(conn) == CONNECTION_BAD) { fprintf(stderr, "%s: could not connect to database %s: %s", - "oid2name", my_opts->dbname, PQerrorMessage(conn)); + "oid2name", PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn)); PQfinish(conn); exit(1); } diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index da98dab1927..9ee46985f87 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) { fprintf(stderr, "Connection to database \"%s\" failed:\n%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 e817cf04d30..ad039313345 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -2075,7 +2075,7 @@ connectDatabase(const char *dbname, const char *connection_string, { fprintf(stderr, _("%s: could not connect to database \"%s\": %s"), - progname, dbname, PQerrorMessage(conn)); + progname, 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 247f1e1eadd..d1f091a65cd 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -904,7 +904,7 @@ doConnect(void) if (PQstatus(conn) == CONNECTION_BAD) { fprintf(stderr, "connection to database \"%s\" failed:\n%s", - dbName, PQerrorMessage(conn)); + PQdb(conn), PQerrorMessage(conn)); PQfinish(conn); return NULL; } @@ -4166,7 +4166,8 @@ main(int argc, char **argv) if (PQstatus(con) == CONNECTION_BAD) { - fprintf(stderr, "connection to database \"%s\" failed\n", dbName); + fprintf(stderr, "connection to database \"%s\" failed\n", + PQdb(con) ? PQdb(con) : ""); fprintf(stderr, "%s", PQerrorMessage(con)); exit(1); } |