> diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c > index f6b740df0a..b3bee39457 100644 > --- a/src/backend/parser/parse_relation.c > +++ b/src/backend/parser/parse_relation.c > @@ -3667,8 +3667,8 @@ errorMissingColumn(ParseState *pstate, > ereport(ERROR, > (errcode(ERRCODE_UNDEFINED_COLUMN), > relname ? > - errmsg("column %s.%s does not exist", relname, colname) : > - errmsg("column \"%s\" does not exist", colname), > + errmsg("column or variable %s.%s does not exist", relname, colname) : > + errmsg("column or variable \"%s\" does not exist", colname), > state->rfirst ? closestfirst ? > errhint("Perhaps you meant to reference the column \"%s.%s\".", > state->rfirst->eref->aliasname, closestfirst) :
This is in your patch 12. I wonder -- if relname is not null, then surely this is a column and not a variable, right? So only the second errmsg() here should be changed, and the first one should remain as in the original.
