From 86437ddf8c8da6fff49bdf08a22af3460e078eeb Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Fri, 1 Jul 2016 11:29:25 -0400 Subject: postgres_fdw: Fix cache lookup failure while creating error context. 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 --- contrib/postgres_fdw/postgres_fdw.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'contrib/postgres_fdw/postgres_fdw.c') diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index ccfad1b82a3..93ebd8cab68 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -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); + } } /* -- cgit v1.2.3