Fix dblink's failure to report correct connection name in error messages.

The DBLINK_GET_CONN and DBLINK_GET_NAMED_CONN macros did not set the
surrounding function's conname variable, causing errors to be incorrectly
reported as having occurred on the "unnamed" connection in some cases.
This bug was actually visible in two cases in the regression tests,
but apparently whoever added those cases wasn't paying attention.

Noted by Kyotaro Horiguchi, though this is different from his proposed
patch.

Back-patch to 8.4; 8.3 does not have the same type of error reporting
so the patch is not relevant.

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index d68b12aeddca6a4d1ec6e54a6adc797202a1e0d0..c8f91a72fb38e1a6bfd857264af81c38caaa49fe 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -167,9 +167,10 @@ typedef struct remoteConnHashEnt
        do { \
                        char *conname_or_str = text_to_cstring(PG_GETARG_TEXT_PP(0)); \
                        rconn = getConnectionByName(conname_or_str); \
-                       if(rconn) \
+                       if (rconn) \
                        { \
                                conn = rconn->conn; \
+                               conname = conname_or_str; \
                        } \
                        else \
                        { \
@@ -197,9 +198,9 @@ typedef struct remoteConnHashEnt
 
 #define DBLINK_GET_NAMED_CONN \
        do { \
-                       char *conname = text_to_cstring(PG_GETARG_TEXT_PP(0)); \
+                       conname = text_to_cstring(PG_GETARG_TEXT_PP(0)); \
                        rconn = getConnectionByName(conname); \
-                       if(rconn) \
+                       if (rconn) \
                                conn = rconn->conn; \
                        else \
                                DBLINK_CONN_NOT_AVAIL; \
@@ -718,6 +719,7 @@ PG_FUNCTION_INFO_V1(dblink_send_query);
 Datum
 dblink_send_query(PG_FUNCTION_ARGS)
 {
+       char       *conname = NULL;
        PGconn     *conn = NULL;
        char       *connstr = NULL;
        char       *sql = NULL;
@@ -1042,6 +1044,7 @@ PG_FUNCTION_INFO_V1(dblink_is_busy);
 Datum
 dblink_is_busy(PG_FUNCTION_ARGS)
 {
+       char       *conname = NULL;
        PGconn     *conn = NULL;
        remoteConn *rconn = NULL;
 
@@ -1068,6 +1071,7 @@ Datum
 dblink_cancel_query(PG_FUNCTION_ARGS)
 {
        int                     res = 0;
+       char       *conname = NULL;
        PGconn     *conn = NULL;
        remoteConn *rconn = NULL;
        PGcancel   *cancel;
@@ -1102,6 +1106,7 @@ Datum
 dblink_error_message(PG_FUNCTION_ARGS)
 {
        char       *msg;
+       char       *conname = NULL;
        PGconn     *conn = NULL;
        remoteConn *rconn = NULL;
 

diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index 214645a8063203b7af7f0735827a39c54540f93c..684a30e13c015bc655836d1df73ad76d73767cfb 100644 (file)
--- a/contrib/dblink/expected/dblink.out
+++ b/contrib/dblink/expected/dblink.out
@@ -381,7 +381,7 @@ SELECT *
 FROM dblink('myconn','SELECT * FROM foobar',false) AS t(a int, b text, c text[])
 WHERE t.a > 7;
 NOTICE:  relation "foobar" does not exist
-CONTEXT:  Error occurred on dblink connection named "unnamed": could not execute query.
+CONTEXT:  Error occurred on dblink connection named "myconn": could not execute query.
  a | b | c 
 ---+---+---
 (0 rows)
@@ -504,7 +504,7 @@ SELECT dblink_close('myconn','rmt_foo_cursor');
 -- this should fail because there is no open transaction
 SELECT dblink_exec('myconn','DECLARE xact_test CURSOR FOR SELECT * FROM foo');
 ERROR:  DECLARE CURSOR can only be used in transaction blocks
-CONTEXT:  Error occurred on dblink connection named "unnamed": could not execute command.
+CONTEXT:  Error occurred on dblink connection named "myconn": could not execute command.
 -- reset remote transaction state
 SELECT dblink_exec('myconn','ABORT');
  dblink_exec