Skip to content

Commit bc0bcce

Browse files
committed
Fix failure to detect some cases of improperly-nested aggregates.
check_agg_arguments_walker() supposed that it needn't descend into the arguments of a lower-level aggregate function, but this is just wrong in the presence of multiple levels of sub-select. The oversight would lead to executor failures on queries that should be rejected. (Prior to v11, they actually were rejected, thanks to a "redundant" execution-time check.) Per bug #17835 from Anban Company. Back-patch to all supported branches. Discussion: https://postgr.es/m/17835-4f29f3098b2d0ba4@postgresql.org
1 parent 96bef43 commit bc0bcce

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/backend/parser/parse_agg.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,7 @@ check_agg_arguments_walker(Node *node,
717717
context->min_agglevel > agglevelsup)
718718
context->min_agglevel = agglevelsup;
719719
}
720-
/* no need to examine args of the inner aggregate */
721-
return false;
720+
/* Continue and descend into subtree */
722721
}
723722
if (IsA(node, GroupingFunc))
724723
{

src/test/regress/expected/aggregates.out

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,6 +1187,12 @@ select (select max(min(unique1)) from int8_tbl) from tenk1;
11871187
ERROR: aggregate function calls cannot be nested
11881188
LINE 1: select (select max(min(unique1)) from int8_tbl) from tenk1;
11891189
^
1190+
select avg((select avg(a1.col1 order by (select avg(a2.col2) from tenk1 a3))
1191+
from tenk1 a1(col1)))
1192+
from tenk1 a2(col2);
1193+
ERROR: aggregate function calls cannot be nested
1194+
LINE 1: select avg((select avg(a1.col1 order by (select avg(a2.col2)...
1195+
^
11901196
--
11911197
-- Test removal of redundant GROUP BY columns
11921198
--

src/test/regress/sql/aggregates.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,9 @@ drop table minmaxtest cascade;
397397
-- check for correct detection of nested-aggregate errors
398398
select max(min(unique1)) from tenk1;
399399
select (select max(min(unique1)) from int8_tbl) from tenk1;
400+
select avg((select avg(a1.col1 order by (select avg(a2.col2) from tenk1 a3))
401+
from tenk1 a1(col1)))
402+
from tenk1 a2(col2);
400403

401404
--
402405
-- Test removal of redundant GROUP BY columns

0 commit comments

Comments
 (0)