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

diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 73da5fa101ef7b95e69e754cbc313860a7350b12..bd98dbd7ace610dee5b55819e087a75f7929a4a5 100644 (file)
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -717,8 +717,7 @@ check_agg_arguments_walker(Node *node,
                context->min_agglevel > agglevelsup)
                context->min_agglevel = agglevelsup;
        }
-       /* no need to examine args of the inner aggregate */
-       return false;
+       /* Continue and descend into subtree */
    }
    if (IsA(node, GroupingFunc))
    {

diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
index b1b0191d177d6f81c0ebeaf7fb4c0b7990586936..d5eee4eeb96ab3343359f544319af5f446684dfa 100644 (file)
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -1187,6 +1187,12 @@ select (select max(min(unique1)) from int8_tbl) from tenk1;
 ERROR:  aggregate function calls cannot be nested
 LINE 1: select (select max(min(unique1)) from int8_tbl) from tenk1;
                            ^
+select avg((select avg(a1.col1 order by (select avg(a2.col2) from tenk1 a3))
+            from tenk1 a1(col1)))
+from tenk1 a2(col2);
+ERROR:  aggregate function calls cannot be nested
+LINE 1: select avg((select avg(a1.col1 order by (select avg(a2.col2)...
+                                                        ^
 --
 -- Test removal of redundant GROUP BY columns
 --

diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql
index d61359fb36ed40e1007f977b1fb5c24283e7e81a..cb89ba32570ea7c4e38c96d1ab514b3813f1e776 100644 (file)
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -397,6 +397,9 @@ drop table minmaxtest cascade;
 -- check for correct detection of nested-aggregate errors
 select max(min(unique1)) from tenk1;
 select (select max(min(unique1)) from int8_tbl) from tenk1;
+select avg((select avg(a1.col1 order by (select avg(a2.col2) from tenk1 a3))
+            from tenk1 a1(col1)))
+from tenk1 a2(col2);
 
 --
 -- Test removal of redundant GROUP BY columns