diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-05-31 01:03:23 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-05-31 01:03:23 +0000 |
| commit | 83b72ee286764e20c3f1c8c418780bab50ff6c29 (patch) | |
| tree | 3b245169d7a3826510d8cd55c8c7ab749c520e02 /src/backend/parser/parse_func.c | |
| parent | 12a323b7a8d430e9bddae7c0155239d7a5790afc (diff) | |
| download | postgresql-83b72ee286764e20c3f1c8c418780bab50ff6c29.tar.gz postgresql-83b72ee286764e20c3f1c8c418780bab50ff6c29.zip | |
ParseComplexProjection should make use of expandRecordVariable so that
it can handle cases like (foo.x).y where foo is a subquery and x is
a function-returning-RECORD RTE in that subquery.
Diffstat (limited to 'src/backend/parser/parse_func.c')
| -rw-r--r-- | src/backend/parser/parse_func.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 002e15a9fa2..e585e6df716 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.179 2005/04/23 22:09:58 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.180 2005/05/31 01:03:23 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -25,6 +25,7 @@ #include "parser/parse_expr.h" #include "parser/parse_func.h" #include "parser/parse_relation.h" +#include "parser/parse_target.h" #include "parser/parse_type.h" #include "utils/builtins.h" #include "utils/fmgroids.h" @@ -957,6 +958,9 @@ ParseComplexProjection(ParseState *pstate, char *funcname, Node *first_arg) * function. A bonus is that we avoid generating an unnecessary * FieldSelect; our result can omit the whole-row Var and just be a * Var for the selected field. + * + * This case could be handled by expandRecordVariable, but it's + * more efficient to do it this way when possible. */ if (IsA(first_arg, Var) && ((Var *) first_arg)->varattno == InvalidAttrNumber) @@ -971,12 +975,18 @@ ParseComplexProjection(ParseState *pstate, char *funcname, Node *first_arg) } /* - * Else do it the hard way. Note that if the arg is of RECORD type, - * and isn't resolvable as a function with OUT params, we will never - * be able to recognize a column name here. + * Else do it the hard way with get_expr_result_type(). + * + * If it's a Var of type RECORD, we have to work even harder: we have + * to find what the Var refers to, and pass that to get_expr_result_type. + * That task is handled by expandRecordVariable(). */ - if (get_expr_result_type(first_arg, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) + if (IsA(first_arg, Var) && + ((Var *) first_arg)->vartype == RECORDOID) + tupdesc = expandRecordVariable(pstate, (Var *) first_arg, 0); + else if (get_expr_result_type(first_arg, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) return NULL; /* unresolvable RECORD type */ + Assert(tupdesc); for (i = 0; i < tupdesc->natts; i++) { |