postgres_fdw: Fix unexpected reporting of empty message.

pgfdw_report_error() in postgres_fdw gets a message from PGresult or
PGconn to report an error received from a remote server. Previously
if it could get a message from neither of them, it reported empty
message unexpectedly. The cause of this issue was that pgfdw_report_error()
didn't handle properly the case where no message could be obtained
and its local variable message_primary was set to '\0'.

This commit improves pgfdw_report_error() so that it reports the message
"could not obtain ..." when it gets no message and message_primary
is set to '\0'. This is the same behavior as when message_primary is NULL.

dblink_res_error() in dblink has the same issue, so this commit also
improves it in the same way.

Back-patch to all supported branches.

Author: Fujii Masao
Reviewed-by: Bharath Rupireddy
Discussion: https://postgr.es/m/477c16c8-7ea4-20fc-38d5-ed3a77ed616c@oss.nttdata.com

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index f4efdd4b377779b73cd85ce81e1614848676b189..4a9f0e1746204098f05d28c2efea670c2f477d80 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -2758,7 +2758,8 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res,
 
        ereport(level,
                        (errcode(sqlstate),
-                        message_primary ? errmsg_internal("%s", message_primary) :
+                        (message_primary != NULL && message_primary[0] != '\0') ?
+                        errmsg_internal("%s", message_primary) :
                         errmsg("could not obtain message string for remote error"),
                         message_detail ? errdetail_internal("%s", message_detail) : 0,
                         message_hint ? errhint("%s", message_hint) : 0,

diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 53de2468f239ee72664272d39988085c7b74ff3f..af473b499f34c92a1a3627c39e50f7762e5cd06d 100644 (file)
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -625,7 +625,8 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn,
 
                ereport(elevel,
                                (errcode(sqlstate),
-                                message_primary ? errmsg_internal("%s", message_primary) :
+                                (message_primary != NULL && message_primary[0] != '\0') ?
+                                errmsg_internal("%s", message_primary) :
                                 errmsg("could not obtain message string for remote error"),
                                 message_detail ? errdetail_internal("%s", message_detail) : 0,
                                 message_hint ? errhint("%s", message_hint) : 0,