Fixed #31097 -- Fixed crash of ArrayAgg and StringAgg with filter when used in Subquery.

1 files changed, 1 insertions, 10 deletions

diff --git a/django/contrib/postgres/aggregates/mixins.py b/django/contrib/postgres/aggregates/mixins.py
index 4625738beb..3a43ca1a63 100644
--- a/django/contrib/postgres/aggregates/mixins.py
+++ b/django/contrib/postgres/aggregates/mixins.py
@@ -40,16 +40,7 @@ class OrderableAggMixin:
         return super().set_source_expressions(exprs[:self._get_ordering_expressions_index()])
 
     def get_source_expressions(self):
-        return self.source_expressions + self.ordering
-
-    def get_source_fields(self):
-        # Filter out fields contributed by the ordering expressions as
-        # these should not be used to determine which the return type of the
-        # expression.
-        return [
-            e._output_field_or_none
-            for e in self.get_source_expressions()[:self._get_ordering_expressions_index()]
-        ]
+        return super().get_source_expressions() + self.ordering
 
     def _get_ordering_expressions_index(self):
         """Return the index at which the ordering expressions start."""