diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-03 14:46:57 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-03 14:46:57 -0500 |
| commit | 888b5657049f56508645be4f5dd911b2c286438c (patch) | |
| tree | 484afd06dc1a80d2791de33a6a2835c8f7675bca /src/backend/executor/functions.c | |
| parent | c07702995ab48284f730c1ebc9ae066ff14469d0 (diff) | |
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.
Diffstat (limited to 'src/backend/executor/functions.c')
| -rw-r--r-- | src/backend/executor/functions.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index ef184b69e25..a94a53d5e48 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -309,6 +309,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); @@ -316,6 +321,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); |