mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dblink: Fix error reporting

Browse Source 
The conname variable was not initialized in some code paths, resulting
in error reports referring to the "unnamed" connection rather than the
correct connection name.

Author: Rushabh Lathia <rushabh.lathia@gmail.com>
This commit is contained in:
Peter Eisentraut 2017-03-28 11:08:38 -04:00
parent ff539da316
commit 85163641f8
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/dblink/dblink.c
View File

@ -687,23 +687,25 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
if (PG_NARGS() == 3) if (PG_NARGS() == 3)
{ {
/* text,text,bool */ /* text,text,bool */
dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn); conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
sql = text_to_cstring(PG_GETARG_TEXT_PP(1)); sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
fail = PG_GETARG_BOOL(2); fail = PG_GETARG_BOOL(2);
dblink_get_conn(conname, &conn, &conname, &freeconn);
} }
else if (PG_NARGS() == 2) else if (PG_NARGS() == 2)
{ {
/* text,text or text,bool */ /* text,text or text,bool */
if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID) if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID)
{ {
conn = pconn->conn;
sql = text_to_cstring(PG_GETARG_TEXT_PP(0)); sql = text_to_cstring(PG_GETARG_TEXT_PP(0));
fail = PG_GETARG_BOOL(1); fail = PG_GETARG_BOOL(1);
conn = pconn->conn;
} }
else else
{ {
dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn); conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
sql = text_to_cstring(PG_GETARG_TEXT_PP(1)); sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
dblink_get_conn(conname, &conn, &conname, &freeconn);
} }
} }
else if (PG_NARGS() == 1) else if (PG_NARGS() == 1)
@ -719,16 +721,18 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
else /* is_async */ else /* is_async */
{ {
/* get async result */ /* get async result */
conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
if (PG_NARGS() == 2) if (PG_NARGS() == 2)
{ {
/* text,bool */ /* text,bool */
conn = dblink_get_named_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)));
fail = PG_GETARG_BOOL(1); fail = PG_GETARG_BOOL(1);
conn = dblink_get_named_conn(conname);
} }
else if (PG_NARGS() == 1) else if (PG_NARGS() == 1)
{ {
/* text */ /* text */
conn = dblink_get_named_conn(text_to_cstring(PG_GETARG_TEXT_PP(0))); conn = dblink_get_named_conn(conname);
} }
else else
/* shouldn't happen */ /* shouldn't happen */
@ -1390,23 +1394,25 @@ dblink_exec(PG_FUNCTION_ARGS)
if (PG_NARGS() == 3) if (PG_NARGS() == 3)
{ {
/* must be text,text,bool */ /* must be text,text,bool */
dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn); conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
sql = text_to_cstring(PG_GETARG_TEXT_PP(1)); sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
fail = PG_GETARG_BOOL(2); fail = PG_GETARG_BOOL(2);
dblink_get_conn(conname, &conn, &conname, &freeconn);
} }
else if (PG_NARGS() == 2) else if (PG_NARGS() == 2)
{ {
/* might be text,text or text,bool */ /* might be text,text or text,bool */
if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID) if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID)
{ {
conn = pconn->conn;
sql = text_to_cstring(PG_GETARG_TEXT_PP(0)); sql = text_to_cstring(PG_GETARG_TEXT_PP(0));
fail = PG_GETARG_BOOL(1); fail = PG_GETARG_BOOL(1);
conn = pconn->conn;
} }
else else
{ {
dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn); conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
sql = text_to_cstring(PG_GETARG_TEXT_PP(1)); sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
dblink_get_conn(conname, &conn, &conname, &freeconn);
} }
} }
else if (PG_NARGS() == 1) else if (PG_NARGS() == 1)