Report the true database name on connection errors

alvherre · alvherre · commit fdd405c63fff · 2021-01-26T16:42:13.000-03:00
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 2930c05, make sure not to try to print NULL.) Apply to branches 9.5 through 13. Branch master has already been changed differently by commit 58cd8dc. Reported-by: Robert Haas <robertmhaas@gmail.com> Discussion: https://postgr.es/m/CA+TgmobssJ6rS22dspWnu-oDxXevGmhMD8VcRBjmj-b9UDqRjw@mail.gmail.com
diff --git 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
@@ -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
@@ -1681,7 +1681,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
@@ -1163,7 +1163,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;
 	}
@@ -5410,7 +5410,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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ sql_conn(struct options *my_opts)`
`320`	`320`	`if (PQstatus(conn) == CONNECTION_BAD)`
`321`	`321`	`{`
`322`	`322`	`fprintf(stderr, "%s: could not connect to database %s: %s",`
`323`		`- "oid2name", my_opts->dbname, PQerrorMessage(conn));`
	`323`	`+ "oid2name", PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn));`
`324`	`324`	`PQfinish(conn);`
`325`	`325`	`exit(1);`
`326`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ vacuumlo(const char database, const struct _param param)`
`129`	`129`	`if (PQstatus(conn) == CONNECTION_BAD)`
`130`	`130`	`{`
`131`	`131`	`fprintf(stderr, "Connection to database \"%s\" failed:\n%s",`
`132`		`- database, PQerrorMessage(conn));`
	`132`	`+ PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn));`
`133`	`133`	`PQfinish(conn);`
`134`	`134`	`return -1;`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1681,7 +1681,7 @@ connectDatabase(const char dbname, const char connection_string,`
`1681`	`1681`	`{`
`1682`	`1682`	`fprintf(stderr,`
`1683`	`1683`	`_("%s: could not connect to database \"%s\": %s"),`
`1684`		`- progname, dbname, PQerrorMessage(conn));`
	`1684`	`+ progname, PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn));`
`1685`	`1685`	`exit_nicely(1);`
`1686`	`1686`	`}`
`1687`	`1687`	`else`
Original file line number	Diff line number	Diff line change
`@@ -1163,7 +1163,7 @@ doConnect(void)`
`1163`	`1163`	`if (PQstatus(conn) == CONNECTION_BAD)`
`1164`	`1164`	`{`
`1165`	`1165`	`fprintf(stderr, "connection to database \"%s\" failed:\n%s",`
`1166`		`- dbName, PQerrorMessage(conn));`
	`1166`	`+ PQdb(conn), PQerrorMessage(conn));`
`1167`	`1167`	`PQfinish(conn);`
`1168`	`1168`	`return NULL;`
`1169`	`1169`	`}`
`@@ -5410,7 +5410,8 @@ main(int argc, char **argv)`
`5410`	`5410`
`5411`	`5411`	`if (PQstatus(con) == CONNECTION_BAD)`
`5412`	`5412`	`{`
`5413`		`- fprintf(stderr, "connection to database \"%s\" failed\n", dbName);`
	`5413`	`+ fprintf(stderr, "connection to database \"%s\" failed\n",`
	`5414`	`+ PQdb(con) ? PQdb(con) : "");`
`5414`	`5415`	`fprintf(stderr, "%s", PQerrorMessage(con));`
`5415`	`5416`	`exit(1);`
`5416`	`5417`	`}`