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

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
0436f6bde by copying the logic for window functions ... but that was
broken too, and had been since commit eaccfded9.

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
index 481a4ddc4847d49d73bef4181a891210248e7721..f7975abe093c4bbc66759633639eb5d4b4769965 100644 (file)
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -700,7 +700,7 @@ check_agg_arguments_walker(Node *node,
        /* Continue and descend into subtree */
    }
    /* 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"),