diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-03-12 00:52:10 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-03-12 00:52:10 +0000 |
| commit | 6eeb95f0f56bb5e8a0a9328aeec04c9e6de87272 (patch) | |
| tree | 5f209c5926768472f9d4fd7210065c18831dbd9c /src/include/parser/parse_relation.h | |
| parent | 66b6bf67a197db73a880d2a4d9dab05168cde8e0 (diff) | |
| download | postgresql-6eeb95f0f56bb5e8a0a9328aeec04c9e6de87272.tar.gz postgresql-6eeb95f0f56bb5e8a0a9328aeec04c9e6de87272.zip | |
Restructure representation of join alias variables. An explicit JOIN
now has an RTE of its own, and references to its outputs now are Vars
referencing the JOIN RTE, rather than CASE-expressions. This allows
reverse-listing in ruleutils.c to use the correct alias easily, rather
than painfully reverse-engineering the alias namespace as it used to do.
Also, nested FULL JOINs work correctly, because the result of the inner
joins are simple Vars that the planner can cope with. This fixes a bug
reported a couple times now, notably by Tatsuo on 18-Nov-01. The alias
Vars are expanded into COALESCE expressions where needed at the very end
of planning, rather than during parsing.
Also, beginnings of support for showing plan qualifier expressions in
EXPLAIN. There are probably still cases that need work.
initdb forced due to change of stored-rule representation.
Diffstat (limited to 'src/include/parser/parse_relation.h')
| -rw-r--r-- | src/include/parser/parse_relation.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 3bc575f6ace..1b579850f4e 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.28 2001/11/05 17:46:35 momjian Exp $ + * $Id: parse_relation.h,v 1.29 2002/03/12 00:52:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ #include "parser/parse_node.h" -extern Node *refnameRangeOrJoinEntry(ParseState *pstate, +extern RangeTblEntry *refnameRangeTblEntry(ParseState *pstate, char *refname, int *sublevels_up); extern void checkNameSpaceConflicts(ParseState *pstate, Node *namespace1, @@ -36,14 +36,21 @@ extern RangeTblEntry *addRangeTableEntryForSubquery(ParseState *pstate, Query *subquery, Attr *alias, bool inFromCl); +extern RangeTblEntry *addRangeTableEntryForJoin(ParseState *pstate, + List *colnames, + JoinType jointype, + List *coltypes, + List *coltypmods, + List *leftcols, + List *rightcols, + Attr *alias, + bool inFromCl); extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte, bool addToJoinList, bool addToNameSpace); extern RangeTblEntry *addImplicitRTE(ParseState *pstate, char *relname); extern void expandRTE(ParseState *pstate, RangeTblEntry *rte, List **colnames, List **colvars); extern List *expandRelAttrs(ParseState *pstate, RangeTblEntry *rte); -extern List *expandJoinAttrs(ParseState *pstate, JoinExpr *join, - int sublevels_up); extern int attnameAttNum(Relation rd, char *a); extern Name attnumAttName(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid); |