Refs #27849 -- Fixed filtered aggregates crash on filters that match …

…everything.
Yako3 · Nov 7, 2022 · 967f875 · 967f875
1 parent 77cf70e
commit 967f875
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/django/db/models/aggregates.py b/django/db/models/aggregates.py
@@ -105,17 +105,18 @@ def as_sql(self, compiler, connection, **extra_context):
         if self.filter:
             if connection.features.supports_aggregate_filter_clause:
                 filter_sql, filter_params = self.filter.as_sql(compiler, connection)
-                template = self.filter_template % extra_context.get(
-                    "template", self.template
-                )
-                sql, params = super().as_sql(
-                    compiler,
-                    connection,
-                    template=template,
-                    filter=filter_sql,
-                    **extra_context,
-                )
-                return sql, (*params, *filter_params)
+                if filter_sql:
+                    template = self.filter_template % extra_context.get(
+                        "template", self.template
+                    )
+                    sql, params = super().as_sql(
+                        compiler,
+                        connection,
+                        template=template,
+                        filter=filter_sql,
+                        **extra_context,
+                    )
+                    return sql, (*params, *filter_params)
             else:
                 copy = self.copy()
                 copy.filter = None

diff --git a/tests/aggregation/test_filter_argument.py b/tests/aggregation/test_filter_argument.py
@@ -205,3 +205,16 @@ def test_filtered_aggregate_empty_condition(self):
             max_rating=Max("rating", filter=Q(rating__in=[]))
         )
         self.assertEqual(aggregate, {"max_rating": None})
+
+    def test_filtered_aggregate_full_condition(self):
+        book = Book.objects.annotate(
+            authors_count=Count(
+                "authors",
+                filter=~Q(authors__in=[]),
+            ),
+        ).get(pk=self.b1.pk)
+        self.assertEqual(book.authors_count, 2)
+        aggregate = Book.objects.aggregate(
+            max_rating=Max("rating", filter=~Q(rating__in=[]))
+        )
+        self.assertEqual(aggregate, {"max_rating": 4.5})