Dept of second thoughts: keep aliasp_item in sync with tlistitem.

tglsfdc · tglsfdc · commit d01d97c25cf4 · 2017-10-27T18:16:25.000-04:00
Commit d5b760e 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.
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
@@ -1844,7 +1844,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)
@@ -1860,6 +1859,8 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
 
 						*colvars = lappend(*colvars, varnode);
 					}
+
+					aliasp_item = lnext(aliasp_item);
 				}
 			}
 			break;

Original file line number	Diff line number	Diff line change
`@@ -1844,7 +1844,6 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,`
`1844`	`1844`	`char *label = strVal(lfirst(aliasp_item));`
`1845`	`1845`
`1846`	`1846`	`colnames = lappend(colnames, makeString(pstrdup(label)));`
`1847`		`- aliasp_item = lnext(aliasp_item);`
`1848`	`1847`	`}`
`1849`	`1848`
`1850`	`1849`	`if (colvars)`
`@@ -1860,6 +1859,8 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,`
`1860`	`1859`
`1861`	`1860`	`colvars = lappend(colvars, varnode);`
`1862`	`1861`	`}`
	`1862`	`+`
	`1863`	`+ aliasp_item = lnext(aliasp_item);`
`1863`	`1864`	`}`
`1864`	`1865`	`}`
`1865`	`1866`	`break;`