From 0def2573c5f0ff127d0c7dc12ec7da56ae6fb7fe Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 3 Feb 2014 14:46:51 -0500 Subject: Fix *-qualification of named parameters in SQL-language functions. Given a composite-type parameter named x, "$1.*" worked fine, but "x.*" not so much. This has been broken since named parameter references were added in commit 9bff0780cf5be2193a5bad0d3df2dbe143085264, so patch back to 9.2. Per bug #9085 from Hardy Falk. --- src/backend/executor/functions.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/backend/executor/functions.c') diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 9c179707f40..b5af19acf1a 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -310,6 +310,11 @@ sql_fn_post_column_ref(ParseState *pstate, ColumnRef *cref, Node *var) * (the first possibility takes precedence) * A.B.C A = function name, B = record-typed parameter name, * C = field name + * A.* Whole-row reference to composite parameter A. + * A.B.* Same, with A = function name, B = parameter name + * + * Here, it's sufficient to ignore the "*" in the last two cases --- the + * main parser will take care of expanding the whole-row reference. *---------- */ nnames = list_length(cref->fields); @@ -317,6 +322,9 @@ sql_fn_post_column_ref(ParseState *pstate, ColumnRef *cref, Node *var) if (nnames > 3) return NULL; + if (IsA(llast(cref->fields), A_Star)) + nnames--; + field1 = (Node *) linitial(cref->fields); Assert(IsA(field1, String)); name1 = strVal(field1); -- cgit v1.2.3