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(