postgres
diff --git a/‎contrib/oid2name/oid2name.c
Copy file name to clipboardExpand all lines: contrib/oid2name/oid2name.c
+2-2Lines changed: 2 additions & 2 deletions b/‎contrib/oid2name/oid2name.c
Copy file name to clipboardExpand all lines: contrib/oid2name/oid2name.c
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎contrib/vacuumlo/vacuumlo.c
Copy file name to clipboardExpand all lines: contrib/vacuumlo/vacuumlo.c
+1-1Lines changed: 1 addition & 1 deletion b/‎contrib/vacuumlo/vacuumlo.c
Copy file name to clipboardExpand all lines: contrib/vacuumlo/vacuumlo.c
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/pg_dump/pg_dumpall.c
Copy file name to clipboardExpand all lines: src/bin/pg_dump/pg_dumpall.c
+1-1Lines changed: 1 addition & 1 deletion b/‎src/bin/pg_dump/pg_dumpall.c
Copy file name to clipboardExpand all lines: src/bin/pg_dump/pg_dumpall.c
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bin/pgbench/pgbench.c
Copy file name to clipboardExpand all lines: src/bin/pgbench/pgbench.c
+2-2Lines changed: 2 additions & 2 deletions b/‎src/bin/pgbench/pgbench.c
Copy file name to clipboardExpand all lines: src/bin/pgbench/pgbench.c
+2-2Lines changed: 2 additions & 2 deletions
@@ -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);
 	}
 
@@ -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;
 	}
 
@@ -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
 
@@ -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);
 	}
Original file line number	Diff line number	Diff line change
`@@ -348,8 +348,8 @@ sql_conn(struct options *my_opts)`
`348`	`348`	`/* check to see that the backend connection was successfully made */`
`349`	`349`	`if (PQstatus(conn) == CONNECTION_BAD)`
`350`	`350`	`{`
`351`		`- pg_log_error("could not connect to database %s: %s",`
`352`		`- my_opts->dbname, PQerrorMessage(conn));`
	`351`	`+ pg_log_error("could not connect to database \"%s\": %s",`
	`352`	`+ PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn));`
`353`	`353`	`PQfinish(conn);`
`354`	`354`	`exit(1);`
`355`	`355`	`}`
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`	`pg_log_error("connection to database \"%s\" failed: %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
`@@ -1773,7 +1773,7 @@ connectDatabase(const char dbname, const char connection_string,`
`1773`	`1773`	`if (fail_on_error)`
`1774`	`1774`	`{`
`1775`	`1775`	`pg_log_error("could not connect to database \"%s\": %s",`
`1776`		`- dbname, PQerrorMessage(conn));`
	`1776`	`+ PQdb(conn) ? PQdb(conn) : "", PQerrorMessage(conn));`
`1777`	`1777`	`exit_nicely(1);`
`1778`	`1778`	`}`
`1779`	`1779`	`else`
Original file line number	Diff line number	Diff line change
`@@ -1228,7 +1228,7 @@ doConnect(void)`
`1228`	`1228`	`if (PQstatus(conn) == CONNECTION_BAD)`
`1229`	`1229`	`{`
`1230`	`1230`	`pg_log_error("connection to database \"%s\" failed: %s",`
`1231`		`- dbName, PQerrorMessage(conn));`
	`1231`	`+ PQdb(conn), PQerrorMessage(conn));`
`1232`	`1232`	`PQfinish(conn);`
`1233`	`1233`	`return NULL;`
`1234`	`1234`	`}`
`@@ -6047,7 +6047,7 @@ main(int argc, char **argv)`
`6047`	`6047`	`if (PQstatus(con) == CONNECTION_BAD)`
`6048`	`6048`	`{`
`6049`	`6049`	`pg_log_fatal("connection to database \"%s\" failed: %s",`
`6050`		`- dbName, PQerrorMessage(con));`
	`6050`	`+ PQdb(con) ? PQdb(con) : "", PQerrorMessage(con));`
`6051`	`6051`	`exit(1);`
`6052`	`6052`	`}`
`6053`	`6053`