diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-08-19 20:57:41 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-08-19 20:57:41 +0000 |
| commit | bbd6eb5b958ef38f786089fd4a03d650d4b7220e (patch) | |
| tree | 3dbc25578ccd347b586018f6b8a6d8d6baa84ac7 /src/backend/parser/parse_clause.c | |
| parent | 040450beef4f3fdafaa9e20dbb0ee3e00c5856ba (diff) | |
| download | postgresql-bbd6eb5b958ef38f786089fd4a03d650d4b7220e.tar.gz postgresql-bbd6eb5b958ef38f786089fd4a03d650d4b7220e.zip | |
Repair some issues with column aliases and RowExpr construction in the
presence of dropped columns. Document the already-presumed fact that
eref aliases in relation RTEs are supposed to have entries for dropped
columns; cause the user alias structs to have such entries too, so that
there's always a one-to-one mapping to the underlying physical attnums.
Adjust expandRTE() and related code to handle the case where a column
that is part of a JOIN has been dropped. Generalize expandRTE()'s API
so that it can be used in a couple of places that formerly rolled their
own implementation of the same logic. Fix ruleutils.c to suppress
display of aliases for columns that were dropped since the rule was made.
Diffstat (limited to 'src/backend/parser/parse_clause.c')
| -rw-r--r-- | src/backend/parser/parse_clause.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index b3a6b67f5c3..156dbac5aad 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.133 2004/06/16 01:26:44 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.134 2004/08/19 20:57:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -655,8 +655,8 @@ transformFromClauseItem(ParseState *pstate, Node *n, List **containedRels) elog(ERROR, "unrecognized node type: %d", (int) nodeTag(j->larg)); leftrti = 0; /* keep compiler quiet */ } - rte = rt_fetch(leftrti, pstate->p_rtable); - expandRTE(pstate, rte, &l_colnames, &l_colvars); + expandRTE(pstate->p_rtable, leftrti, 0, false, + &l_colnames, &l_colvars); if (IsA(j->rarg, RangeTblRef)) rightrti = ((RangeTblRef *) j->rarg)->rtindex; @@ -667,8 +667,8 @@ transformFromClauseItem(ParseState *pstate, Node *n, List **containedRels) elog(ERROR, "unrecognized node type: %d", (int) nodeTag(j->rarg)); rightrti = 0; /* keep compiler quiet */ } - rte = rt_fetch(rightrti, pstate->p_rtable); - expandRTE(pstate, rte, &r_colnames, &r_colvars); + expandRTE(pstate->p_rtable, rightrti, 0, false, + &r_colnames, &r_colvars); /* * Natural join does not explicitly specify columns; must generate |