diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-10-27 18:16:25 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-10-27 18:16:25 -0400 |
| commit | a4c11c103164be667eef362157b48469ed2d0c10 (patch) | |
| tree | fc659bf124a2ba72994bac8bb8b8b344565e3423 | |
| parent | 80e79718d0ead9d4291ab320bea89ec8f24050ad (diff) | |
| download | postgresql-a4c11c103164be667eef362157b48469ed2d0c10.tar.gz | |
Dept of second thoughts: keep aliasp_item in sync with tlistitem.
Commit d5b760ecb wasn't quite right, on second thought: if the
caller didn't ask for column names then it would happily emit
more Vars than if the caller did ask for column names. This
is surely not a good idea. Advance the aliasp_item whether or
not we're preparing a colnames list.
| -rw-r--r-- | src/backend/parser/parse_relation.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index b8307d5cf5..ae425d3679 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -1619,7 +1619,6 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up, char *label = strVal(lfirst(aliasp_item)); *colnames = lappend(*colnames, makeString(pstrdup(label))); - aliasp_item = lnext(aliasp_item); } if (colvars) @@ -1635,6 +1634,8 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up, *colvars = lappend(*colvars, varnode); } + + aliasp_item = lnext(aliasp_item); } } break; |