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

tglsfdc · tglsfdc · commit a4c11c103164 · 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1619,7 +1619,6 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,`
`1619`	`1619`	`char *label = strVal(lfirst(aliasp_item));`
`1620`	`1620`
`1621`	`1621`	`colnames = lappend(colnames, makeString(pstrdup(label)));`
`1622`		`- aliasp_item = lnext(aliasp_item);`
`1623`	`1622`	`}`
`1624`	`1623`
`1625`	`1624`	`if (colvars)`
`@@ -1635,6 +1634,8 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,`
`1635`	`1634`
`1636`	`1635`	`colvars = lappend(colvars, varnode);`
`1637`	`1636`	`}`
	`1637`	`+`
	`1638`	`+ aliasp_item = lnext(aliasp_item);`
`1638`	`1639`	`}`
`1639`	`1640`	`}`
`1640`	`1641`	`break;`