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 d3a4a50005b..998f2c321e3 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -340,7 +340,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 73c06a043ed..6f0baa7e7c1 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -130,7 +130,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 c04f417cf05..4f924b5741d 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 bf32638b6fd..79b983b4ef5 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -1206,7 +1206,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; } @@ -5678,7 +5678,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); } |