Browse Source

Fixed #33655 -- Removed unnecessary constant from GROUP BY clause for QuerySet.exists().

marcperrinoptel 2 years ago
parent
commit
4282fd468f
2 changed files with 14 additions and 2 deletions
  1. 2 2
      django/db/models/sql/query.py
  2. 12 0
      tests/aggregation/tests.py

+ 2 - 2
django/db/models/sql/query.py

@@ -27,6 +27,7 @@ from django.db.models.expressions import (
     OuterRef,
     Ref,
     ResolvedOuterRef,
+    Value,
 )
 from django.db.models.fields import Field
 from django.db.models.fields.related_lookups import MultiColSource
@@ -582,8 +583,7 @@ class Query(BaseExpression):
         q.clear_ordering(force=True)
         if limit:
             q.set_limits(high=1)
-        q.add_extra({"a": 1}, None, None, None, None, None)
-        q.set_extra_mask(["a"])
+        q.add_annotation(Value(1), "a")
         return q
 
     def has_results(self, using):

+ 12 - 0
tests/aggregation/tests.py

@@ -1434,6 +1434,18 @@ class AggregateTestCase(TestCase):
         )
         self.assertTrue(publisher_qs.exists())
 
+    def test_aggregation_filter_exists(self):
+        publishers_having_more_than_one_book_qs = (
+            Book.objects.values("publisher")
+            .annotate(cnt=Count("isbn"))
+            .filter(cnt__gt=1)
+        )
+        query = publishers_having_more_than_one_book_qs.query.exists(
+            using=connection.alias
+        )
+        _, _, group_by = query.get_compiler(connection=connection).pre_sql_setup()
+        self.assertEqual(len(group_by), 1)
+
     def test_aggregation_exists_annotation(self):
         published_books = Book.objects.filter(publisher=OuterRef("pk"))
         publisher_qs = Publisher.objects.annotate(