Fixed #35042 -- Fixed a count() crash on combined queries.

charettes · felixxm · commit 77278929c861 · 2023-12-16T20:19:24.000+01:00
Regression in 59bea9e. Thanks Marcin for the report.
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
@@ -520,11 +520,11 @@ def get_aggregation(self, using, aggregate_exprs):
                         self.model._meta.pk.get_col(inner_query.get_initial_alias()),
                     )
                 inner_query.default_cols = False
-                if not qualify:
+                if not qualify and not self.combinator:
                     # Mask existing annotations that are not referenced by
                     # aggregates to be pushed to the outer query unless
-                    # filtering against window functions is involved as it
-                    # requires complex realising.
+                    # filtering against window functions or if the query is
+                    # combined as both would require complex realiasing logic.
                     annotation_mask = set()
                     if isinstance(self.group_by, tuple):
                         for expr in self.group_by:
diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py
@@ -2344,3 +2344,18 @@ def test_aggregate_reference_lookup_rhs_iter(self):
             max_book_author=Max("book__authors"),
         ).aggregate(count=Count("id", filter=Q(id__in=[F("max_book_author"), 0])))
         self.assertEqual(aggregates, {"count": 1})
+
+    def test_aggregate_combined_queries(self):
+        # Combined queries could have members in their values select mask while
+        # others have them in their annotation mask which makes annotation
+        # pruning complex to implement hence why it's not implemented.
+        qs = Author.objects.values(
+            "age",
+            other=Value(0),
+        ).union(
+            Book.objects.values(
+                age=Value(0),
+                other=Value(0),
+            )
+        )
+        self.assertEqual(qs.count(), 3)
