Fixed #30315 -- Fixed crash of ArrayAgg and StringAgg with ordering when used in Subquery.

1 files changed, 6 insertions, 0 deletions

diff --git a/django/contrib/postgres/aggregates/mixins.py b/django/contrib/postgres/aggregates/mixins.py
index 6c1ce53b75..4625738beb 100644
--- a/django/contrib/postgres/aggregates/mixins.py
+++ b/django/contrib/postgres/aggregates/mixins.py
@@ -33,6 +33,12 @@ class OrderableAggMixin:
             return sql, sql_params + ordering_params
         return super().as_sql(compiler, connection, ordering='')
 
+    def set_source_expressions(self, exprs):
+        # Extract the ordering expressions because ORDER BY clause is handled
+        # in a custom way.
+        self.ordering = exprs[self._get_ordering_expressions_index():]
+        return super().set_source_expressions(exprs[:self._get_ordering_expressions_index()])
+
     def get_source_expressions(self):
         return self.source_expressions + self.ordering