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

tglsfdc · tglsfdc · commit 21daada10ebf · 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
@@ -2028,7 +2028,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)
@@ -2044,6 +2043,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
`@@ -2028,7 +2028,6 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,`
`2028`	`2028`	`char *label = strVal(lfirst(aliasp_item));`
`2029`	`2029`
`2030`	`2030`	`colnames = lappend(colnames, makeString(pstrdup(label)));`
`2031`		`- aliasp_item = lnext(aliasp_item);`
`2032`	`2031`	`}`
`2033`	`2032`
`2034`	`2033`	`if (colvars)`
`@@ -2044,6 +2043,8 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,`
`2044`	`2043`
`2045`	`2044`	`colvars = lappend(colvars, varnode);`
`2046`	`2045`	`}`
	`2046`	`+`
	`2047`	`+ aliasp_item = lnext(aliasp_item);`
`2047`	`2048`	`}`
`2048`	`2049`	`}`
`2049`	`2050`	`break;`