diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-01-20 22:12:17 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-01-20 22:12:17 +0000 |
| commit | 7f31669beac8cacb828acbdbaf29925a6f0d6677 (patch) | |
| tree | 475dde3edc07221f1fbfec88eb1a3e07470103f9 /src/backend/parser/parse_clause.c | |
| parent | 412a5e653949b930d03056da73afca3c505a80f5 (diff) | |
| download | postgresql-7f31669beac8cacb828acbdbaf29925a6f0d6677.tar.gz postgresql-7f31669beac8cacb828acbdbaf29925a6f0d6677.zip | |
Add Var.varlevelup to code. More parser cleanup.
Diffstat (limited to 'src/backend/parser/parse_clause.c')
| -rw-r--r-- | src/backend/parser/parse_clause.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 115b8c153d7..8e571af58f9 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.10 1998/01/20 05:04:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.11 1998/01/20 22:11:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,16 +39,15 @@ void makeRangeTable(ParseState *pstate, char *relname, List *frmList) { RangeTblEntry *rte; - + parseFromClause(pstate, frmList); if (relname == NULL) return; - if (refnameRangeTablePosn(pstate->p_rtable, relname) < 1) - rte = addRangeTableEntry(pstate, relname, relname, FALSE, FALSE); - else - rte = refnameRangeTableEntry(pstate->p_rtable, relname); + Assert(pstate->p_rtable == NULL); + + rte = addRangeTableEntry(pstate, relname, relname, FALSE, FALSE); pstate->p_target_rangetblentry = rte; Assert(pstate->p_target_relation == NULL); @@ -137,8 +136,7 @@ find_targetlist_entry(ParseState *pstate, SortGroupBy *sortgroupby, List *tlist) TargetEntry *target_result = NULL; if (sortgroupby->range) - real_rtable_pos = refnameRangeTablePosn(pstate->p_rtable, - sortgroupby->range); + real_rtable_pos = refnameRangeTablePosn(pstate, sortgroupby->range, NULL); foreach(i, tlist) { |