NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitdde1813

committed

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 thesurrounding function's conname variable, causing errors to be incorrectlyreported 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 proposedpatch.Back-patch to 8.4; 8.3 does not have the same type of error reportingso the patch is not relevant.

1 parent20d98ab commitdde1813Copy full SHA for dde1813

File tree

2 files changed

+11

-5

lines changed

contrib/dblink
- dblink.c
- expected
  - dblink.out

2 files changed

+11

-5

lines changed

`‎contrib/dblink/dblink.c`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,10 @@ typedef struct remoteConnHashEnt`
`167`	`167`	`do { \`
`168`	`168`	`char *conname_or_str = text_to_cstring(PG_GETARG_TEXT_PP(0)); \`
`169`	`169`	`rconn = getConnectionByName(conname_or_str); \`
`170`		`-if(rconn) \`
	`170`	`+if(rconn) \`
`171`	`171`	`{ \`
`172`	`172`	`conn = rconn->conn; \`
	`173`	`+conname = conname_or_str; \`
`173`	`174`	`} \`
`174`	`175`	`else \`
`175`	`176`	`{ \`
`@@ -197,9 +198,9 @@ typedef struct remoteConnHashEnt`
`197`	`198`
`198`	`199`	`#defineDBLINK_GET_NAMED_CONN \`
`199`	`200`	`do { \`
`200`		`-char *conname = text_to_cstring(PG_GETARG_TEXT_PP(0)); \`
	`201`	`+conname = text_to_cstring(PG_GETARG_TEXT_PP(0)); \`
`201`	`202`	`rconn = getConnectionByName(conname); \`
`202`		`-if(rconn) \`
	`203`	`+if(rconn) \`
`203`	`204`	`conn = rconn->conn; \`
`204`	`205`	`else \`
`205`	`206`	`DBLINK_CONN_NOT_AVAIL; \`
`@@ -612,6 +613,7 @@ PG_FUNCTION_INFO_V1(dblink_send_query);`
`612`	`613`	`Datum`
`613`	`614`	`dblink_send_query(PG_FUNCTION_ARGS)`
`614`	`615`	`{`
	`616`	`+char*conname=NULL;`
`615`	`617`	`PGconn*conn=NULL;`
`616`	`618`	`char*sql=NULL;`
`617`	`619`	`remoteConn*rconn=NULL;`
`@@ -933,6 +935,7 @@ PG_FUNCTION_INFO_V1(dblink_is_busy);`
`933`	`935`	`Datum`
`934`	`936`	`dblink_is_busy(PG_FUNCTION_ARGS)`
`935`	`937`	`{`
	`938`	`+char*conname=NULL;`
`936`	`939`	`PGconn*conn=NULL;`
`937`	`940`	`remoteConn*rconn=NULL;`
`938`	`941`
`@@ -959,6 +962,7 @@ Datum`
`959`	`962`	`dblink_cancel_query(PG_FUNCTION_ARGS)`
`960`	`963`	`{`
`961`	`964`	`intres=0;`
	`965`	`+char*conname=NULL;`
`962`	`966`	`PGconn*conn=NULL;`
`963`	`967`	`remoteConn*rconn=NULL;`
`964`	`968`	`PGcancel*cancel;`
`@@ -993,6 +997,7 @@ Datum`
`993`	`997`	`dblink_error_message(PG_FUNCTION_ARGS)`
`994`	`998`	`{`
`995`	`999`	`char*msg;`
	`1000`	`+char*conname=NULL;`
`996`	`1001`	`PGconn*conn=NULL;`
`997`	`1002`	`remoteConn*rconn=NULL;`
`998`	`1003`
`@@ -1502,6 +1507,7 @@ PG_FUNCTION_INFO_V1(dblink_get_notify);`
`1502`	`1507`	`Datum`
`1503`	`1508`	`dblink_get_notify(PG_FUNCTION_ARGS)`
`1504`	`1509`	`{`
	`1510`	`+char*conname=NULL;`
`1505`	`1511`	`PGconn*conn=NULL;`
`1506`	`1512`	`remoteConn*rconn=NULL;`
`1507`	`1513`	`PGnotify*notify;`

`‎contrib/dblink/expected/dblink.out`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ SELECT *`
`371`	`371`	`FROM dblink('myconn','SELECT * FROM foobar',false) AS t(a int, b text, c text[])`
`372`	`372`	`WHERE t.a > 7;`
`373`	`373`	`NOTICE: relation "foobar" does not exist`
`374`		`-CONTEXT: Error occurred on dblink connection named "unnamed": could not execute query.`
	`374`	`+CONTEXT: Error occurred on dblink connection named "myconn": could not execute query.`
`375`	`375`	`a \| b \| c`
`376`	`376`	`---+---+---`
`377`	`377`	`(0 rows)`
`@@ -494,7 +494,7 @@ SELECT dblink_close('myconn','rmt_foo_cursor');`
`494`	`494`	`-- this should fail because there is no open transaction`
`495`	`495`	`SELECT dblink_exec('myconn','DECLARE xact_test CURSOR FOR SELECT * FROM foo');`
`496`	`496`	`ERROR: DECLARE CURSOR can only be used in transaction blocks`
`497`		`-CONTEXT: Error occurred on dblink connection named "unnamed": could not execute command.`
	`497`	`+CONTEXT: Error occurred on dblink connection named "myconn": could not execute command.`
`498`	`498`	`-- reset remote transaction state`
`499`	`499`	`SELECT dblink_exec('myconn','ABORT');`
`500`	`500`	`dblink_exec`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdde1813

File tree

2 files changed

2 files changed

`‎contrib/dblink/dblink.c`

`‎contrib/dblink/expected/dblink.out`

0 commit comments