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

tglsfdc · tglsfdc · commit e06b9e9dc837 · 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
@@ -1725,7 +1725,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)
@@ -1741,6 +1740,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
`@@ -1725,7 +1725,6 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,`
`1725`	`1725`	`char *label = strVal(lfirst(aliasp_item));`
`1726`	`1726`
`1727`	`1727`	`colnames = lappend(colnames, makeString(pstrdup(label)));`
`1728`		`- aliasp_item = lnext(aliasp_item);`
`1729`	`1728`	`}`
`1730`	`1729`
`1731`	`1730`	`if (colvars)`
`@@ -1741,6 +1740,8 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,`
`1741`	`1740`
`1742`	`1741`	`colvars = lappend(colvars, varnode);`
`1743`	`1742`	`}`
	`1743`	`+`
	`1744`	`+ aliasp_item = lnext(aliasp_item);`
`1744`	`1745`	`}`
`1745`	`1746`	`}`
`1746`	`1747`	`break;`