Async dblink functions require a named connection, and therefore should

jconway · jconway · commit 8af3596d6bb6 · 2011-06-25T15:58:07.000-07:00
use DBLINK_GET_NAMED_CONN rather than DBLINK_GET_CONN.
Problem found by Peter Eisentraut and patch by Fujii Masao.
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
@@ -613,16 +613,13 @@ Datum
 dblink_send_query(PG_FUNCTION_ARGS)
 {
 	PGconn	   *conn = NULL;
-	char	   *connstr = NULL;
 	char	   *sql = NULL;
 	remoteConn *rconn = NULL;
-	char	   *msg;
-	bool		freeconn = false;
 	int			retval;
 
 	if (PG_NARGS() == 2)
 	{
-		DBLINK_GET_CONN;
+		DBLINK_GET_NAMED_CONN;
 		sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
 	}
 	else
@@ -711,13 +708,13 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
 		if (PG_NARGS() == 2)
 		{
 			/* text,bool */
-			DBLINK_GET_CONN;
+			DBLINK_GET_NAMED_CONN;
 			fail = PG_GETARG_BOOL(1);
 		}
 		else if (PG_NARGS() == 1)
 		{
 			/* text */
-			DBLINK_GET_CONN;
+			DBLINK_GET_NAMED_CONN;
 		}
 		else
 			/* shouldn't happen */

Original file line number	Diff line number	Diff line change
`@@ -613,16 +613,13 @@ Datum`
`613`	`613`	`dblink_send_query(PG_FUNCTION_ARGS)`
`614`	`614`	`{`
`615`	`615`	`PGconn *conn = NULL;`
`616`		`- char *connstr = NULL;`
`617`	`616`	`char *sql = NULL;`
`618`	`617`	`remoteConn *rconn = NULL;`
`619`		`- char *msg;`
`620`		`- bool freeconn = false;`
`621`	`618`	`int retval;`
`622`	`619`
`623`	`620`	`if (PG_NARGS() == 2)`
`624`	`621`	`{`
`625`		`- DBLINK_GET_CONN;`
	`622`	`+ DBLINK_GET_NAMED_CONN;`
`626`	`623`	`sql = text_to_cstring(PG_GETARG_TEXT_PP(1));`
`627`	`624`	`}`
`628`	`625`	`else`
`@@ -711,13 +708,13 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)`
`711`	`708`	`if (PG_NARGS() == 2)`
`712`	`709`	`{`
`713`	`710`	`/* text,bool */`
`714`		`- DBLINK_GET_CONN;`
	`711`	`+ DBLINK_GET_NAMED_CONN;`
`715`	`712`	`fail = PG_GETARG_BOOL(1);`
`716`	`713`	`}`
`717`	`714`	`else if (PG_NARGS() == 1)`
`718`	`715`	`{`
`719`	`716`	`/* text */`
`720`		`- DBLINK_GET_CONN;`
	`717`	`+ DBLINK_GET_NAMED_CONN;`
`721`	`718`	`}`
`722`	`719`	`else`
`723`	`720`	`/* shouldn't happen */`