summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcperrinoptel <marc.perrin@optelgroup.com>2022-04-25 15:17:33 -0400
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2022-04-26 06:19:18 +0200
commit4282fd468fd11a7db79307ba1c33a4960c299e4a (patch)
tree4bcfc7aade937e83a920dce84409781d480e8e6d
parentdcebc5da4831d2982b26d00a9480ad538b5c5acf (diff)
Fixed #33655 -- Removed unnecessary constant from GROUP BY clause for QuerySet.exists().
-rw-r--r--django/db/models/sql/query.py4
-rw-r--r--tests/aggregation/tests.py12
2 files changed, 14 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 64e7927f7a..1097de4f79 100644
--- a/django/db/models/sql/query.py
+++ b/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):
diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py
index 61da0ebfe7..c6d73e8042 100644
--- a/tests/aggregation/tests.py
+++ b/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(