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/include/parser/parse_relation.h | |
| 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/include/parser/parse_relation.h')
| -rw-r--r-- | src/include/parser/parse_relation.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 724639dd96a..afb6c6303d6 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.44 2004/04/18 18:12:58 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.45 2004/08/19 20:57:41 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,7 @@ extern int RTERangeTablePosn(ParseState *pstate, extern RangeTblEntry *GetRTEByRangeTablePosn(ParseState *pstate, int varno, int sublevels_up); +extern List *GetLevelNRangeTable(ParseState *pstate, int sublevels_up); extern Node *scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte, char *colname); extern Node *colNameToVar(ParseState *pstate, char *colname, bool localonly); @@ -66,9 +67,11 @@ extern RangeTblEntry *addRangeTableEntryForJoin(ParseState *pstate, extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte, bool addToJoinList, bool addToNameSpace); extern RangeTblEntry *addImplicitRTE(ParseState *pstate, RangeVar *relation); -extern void expandRTE(ParseState *pstate, RangeTblEntry *rte, - List **colnames, List **colvars); -extern List *expandRelAttrs(ParseState *pstate, RangeTblEntry *rte); +extern void expandRTE(List *rtable, int rtindex, int sublevels_up, + bool include_dropped, + List **colnames, List **colvars); +extern List *expandRelAttrs(ParseState *pstate, List *rtable, + int rtindex, int sublevels_up); extern int attnameAttNum(Relation rd, const char *attname, bool sysColOK); extern Name attnumAttName(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid); |