libpq: Message style improvements

petere · petere · commit 7fb3c38e7d7d · 2025-06-26T22:13:53.000+02:00
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -2141,7 +2141,7 @@ pqConnectOptions2(PGconn *conn)
 	if (conn->min_pversion > conn->max_pversion)
 	{
 		conn->status = CONNECTION_BAD;
-		libpq_append_conn_error(conn, "min_protocol_version is greater than max_protocol_version");
+		libpq_append_conn_error(conn, "\"%s\" is greater than \"%s\"", "min_protocol_version", "max_protocol_version");
 		return false;
 	}
 
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
@@ -1434,7 +1434,7 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)
 	/* 3.1 never existed, we went straight from 3.0 to 3.2 */
 	if (their_version == PG_PROTOCOL(3, 1))
 	{
-		libpq_append_conn_error(conn, "received invalid protocol negotiation message: server requests downgrade to non-existent 3.1 protocol version");
+		libpq_append_conn_error(conn, "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version");
 		goto failure;
 	}
 
@@ -1452,9 +1452,10 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)
 
 	if (their_version < conn->min_pversion)
 	{
-		libpq_append_conn_error(conn, "server only supports protocol version %d.%d, but min_protocol_version was set to %d.%d",
+		libpq_append_conn_error(conn, "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d",
 								PG_PROTOCOL_MAJOR(their_version),
 								PG_PROTOCOL_MINOR(their_version),
+								"min_protocol_version",
 								PG_PROTOCOL_MAJOR(conn->min_pversion),
 								PG_PROTOCOL_MINOR(conn->min_pversion));
 
@@ -1476,7 +1477,7 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)
 		}
 		if (strncmp(conn->workBuffer.data, "_pq_.", 5) != 0)
 		{
-			libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported unsupported parameter name without a _pq_. prefix (\"%s\")", conn->workBuffer.data);
+			libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")", "_pq_.", conn->workBuffer.data);
 			goto failure;
 		}
 		libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")", conn->workBuffer.data);
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
@@ -711,15 +711,15 @@ SSL_CTX_keylog_cb(const SSL *ssl, const char *line)
 
 	if (fd == -1)
 	{
-		libpq_append_conn_error(conn, "could not open ssl keylog file \"%s\": %s",
+		libpq_append_conn_error(conn, "could not open SSL key logging file \"%s\": %s",
 								conn->sslkeylogfile, pg_strerror(errno));
 		return;
 	}
 
 	/* line is guaranteed by OpenSSL to be NUL terminated */
 	rc = write(fd, line, strlen(line));
 	if (rc < 0)
-		libpq_append_conn_error(conn, "could not write to ssl keylog file \"%s\": %s",
+		libpq_append_conn_error(conn, "could not write to SSL key logging file \"%s\": %s",
 								conn->sslkeylogfile, pg_strerror(errno));
 	else
 		rc = write(fd, "\n", 1);

Original file line number	Diff line number	Diff line change
`@@ -2141,7 +2141,7 @@ pqConnectOptions2(PGconn *conn)`
`2141`	`2141`	`if (conn->min_pversion > conn->max_pversion)`
`2142`	`2142`	`{`
`2143`	`2143`	`conn->status = CONNECTION_BAD;`
`2144`		`- libpq_append_conn_error(conn, "min_protocol_version is greater than max_protocol_version");`
	`2144`	`+ libpq_append_conn_error(conn, "\"%s\" is greater than \"%s\"", "min_protocol_version", "max_protocol_version");`
`2145`	`2145`	`return false;`
`2146`	`2146`	`}`
`2147`	`2147`
Original file line number	Diff line number	Diff line change
`@@ -1434,7 +1434,7 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)`
`1434`	`1434`	`/* 3.1 never existed, we went straight from 3.0 to 3.2 */`
`1435`	`1435`	`if (their_version == PG_PROTOCOL(3, 1))`
`1436`	`1436`	`{`
`1437`		`- libpq_append_conn_error(conn, "received invalid protocol negotiation message: server requests downgrade to non-existent 3.1 protocol version");`
	`1437`	`+ libpq_append_conn_error(conn, "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version");`
`1438`	`1438`	`goto failure;`
`1439`	`1439`	`}`
`1440`	`1440`
`@@ -1452,9 +1452,10 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)`
`1452`	`1452`
`1453`	`1453`	`if (their_version < conn->min_pversion)`
`1454`	`1454`	`{`
`1455`		`- libpq_append_conn_error(conn, "server only supports protocol version %d.%d, but min_protocol_version was set to %d.%d",`
	`1455`	`+ libpq_append_conn_error(conn, "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d",`
`1456`	`1456`	`PG_PROTOCOL_MAJOR(their_version),`
`1457`	`1457`	`PG_PROTOCOL_MINOR(their_version),`
	`1458`	`+ "min_protocol_version",`
`1458`	`1459`	`PG_PROTOCOL_MAJOR(conn->min_pversion),`
`1459`	`1460`	`PG_PROTOCOL_MINOR(conn->min_pversion));`
`1460`	`1461`
`@@ -1476,7 +1477,7 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)`
`1476`	`1477`	`}`
`1477`	`1478`	`if (strncmp(conn->workBuffer.data, "_pq_.", 5) != 0)`
`1478`	`1479`	`{`
`1479`		`- libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported unsupported parameter name without a _pq_. prefix (\"%s\")", conn->workBuffer.data);`
	`1480`	`+ libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")", "_pq_.", conn->workBuffer.data);`
`1480`	`1481`	`goto failure;`
`1481`	`1482`	`}`
`1482`	`1483`	`libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")", conn->workBuffer.data);`