diff options
Diffstat (limited to 'contrib/dblink/dblink.c')
| -rw-r--r-- | contrib/dblink/dblink.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 36a8e3eceb9..df1ff05a8fe 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -153,9 +153,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 \ { \ @@ -183,9 +184,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; \ @@ -598,6 +599,7 @@ PG_FUNCTION_INFO_V1(dblink_send_query); Datum dblink_send_query(PG_FUNCTION_ARGS) { + char *conname = NULL; PGconn *conn = NULL; char *sql = NULL; remoteConn *rconn = NULL; @@ -919,6 +921,7 @@ PG_FUNCTION_INFO_V1(dblink_is_busy); Datum dblink_is_busy(PG_FUNCTION_ARGS) { + char *conname = NULL; PGconn *conn = NULL; remoteConn *rconn = NULL; @@ -945,6 +948,7 @@ Datum dblink_cancel_query(PG_FUNCTION_ARGS) { int res = 0; + char *conname = NULL; PGconn *conn = NULL; remoteConn *rconn = NULL; PGcancel *cancel; @@ -979,6 +983,7 @@ Datum dblink_error_message(PG_FUNCTION_ARGS) { char *msg; + char *conname = NULL; PGconn *conn = NULL; remoteConn *rconn = NULL; @@ -1488,6 +1493,7 @@ PG_FUNCTION_INFO_V1(dblink_get_notify); Datum dblink_get_notify(PG_FUNCTION_ARGS) { + char *conname = NULL; PGconn *conn = NULL; remoteConn *rconn = NULL; PGnotify *notify; |