Re-allow SRFs and window functions within sub-selects within aggregates.

tglsfdc · tglsfdc · commit 66dee28b40fb · 2017-06-27T17:51:11.000-04:00
check_agg_arguments_walker threw an error upon seeing a SRF or window function, but that is too aggressive: if the function is within a sub-select then it's perfectly fine. I broke the SRF case in commit 0436f6b by copying the logic for window functions ... but that was broken too, and had been since commit eaccfde. Repair both cases in HEAD, and the window function case back to 9.3. 9.2 gets this right.
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
@@ -390,7 +390,7 @@ check_agg_arguments_walker(Node *node,
 		return false;
 	}
 	/* We can throw error on sight for a window function */
-	if (IsA(node, WindowFunc))
+	if (IsA(node, WindowFunc) && context->sublevels_up == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_GROUPING_ERROR),
 				 errmsg("aggregate function calls cannot contain window function calls"),

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ check_agg_arguments_walker(Node *node,`
`390`	`390`	`return false;`
`391`	`391`	`}`
`392`	`392`	`/* We can throw error on sight for a window function */`
`393`		`- if (IsA(node, WindowFunc))`
	`393`	`+ if (IsA(node, WindowFunc) && context->sublevels_up == 0)`
`394`	`394`	`ereport(ERROR,`
`395`	`395`	`(errcode(ERRCODE_GROUPING_ERROR),`
`396`	`396`	`errmsg("aggregate function calls cannot contain window function calls"),`