database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

postgres_fdw: Fix cache lookup failure while creating error context.

Browse Source 
This is fallout from join pushdown; get_relid_attribute_name can't
handle an attribute number of 0, indicating a whole-row reference,
and shouldn't be called in that case.

Etsuro Fujita, reviewed by Ashutosh Bapat
This commit is contained in:
Robert Haas
2016-07-01 11:29:25 -04:00
parent 5f3499b2b5
commit 86437ddf8c
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/postgres_fdw/postgres_fdw.c
View File

@ -4528,6 +4528,7 @@ conversion_error_callback(void *arg)
{
const char *attname = NULL;
const char *relname = NULL;
bool is_wholerow = false;
ConversionLocation *errpos = (ConversionLocation *) arg;
if (errpos->rel)
@ -4560,12 +4561,22 @@ conversion_error_callback(void *arg)
Assert(IsA(var, Var));
rte = rt_fetch(var->varno, estate->es_range_table);
if (var->varattno == 0)
is_wholerow = true;
else
attname = get_relid_attribute_name(rte->relid, var->varattno);
relname = get_rel_name(rte->relid);
attname = get_relid_attribute_name(rte->relid, var->varattno);
}
if (attname && relname)
errcontext("column \"%s\" of foreign table \"%s\"", attname, relname);
if (relname)
{
if (is_wholerow)
errcontext("whole-row reference to foreign table \"%s\"", relname);
else if (attname)
errcontext("column \"%s\" of foreign table \"%s\"", attname, relname);
}
}
/*