diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 0e72a09e59..f30b523346 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -994,6 +994,15 @@ class BooleanField(Field): defaults = {'form_class': form_class, 'required': False} return super().formfield(**{**defaults, **kwargs}) + def select_format(self, compiler, sql, params): + sql, params = super().select_format(compiler, sql, params) + # Filters that match everything are handled as empty strings in the + # WHERE clause, but in SELECT or GROUP BY list they must use a + # predicate that's always True. + if sql == '': + sql = '1' + return sql, params + class CharField(Field): description = _("String (up to %(max_length)s)") diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py index 62912ee99c..2c2b946835 100644 --- a/tests/annotations/tests.py +++ b/tests/annotations/tests.py @@ -210,6 +210,26 @@ class NonAggregateAnnotationTestCase(TestCase): self.assertEqual(len(books), Book.objects.count()) self.assertTrue(all(not book.selected for book in books)) + def test_full_expression_annotation(self): + books = Book.objects.annotate( + selected=ExpressionWrapper(~Q(pk__in=[]), output_field=BooleanField()), + ) + self.assertEqual(len(books), Book.objects.count()) + self.assertTrue(all(book.selected for book in books)) + + def test_full_expression_annotation_with_aggregation(self): + qs = Book.objects.filter(isbn='159059725').annotate( + selected=ExpressionWrapper(~Q(pk__in=[]), output_field=BooleanField()), + rating_count=Count('rating'), + ) + self.assertEqual([book.rating_count for book in qs], [1]) + + def test_aggregate_over_full_expression_annotation(self): + qs = Book.objects.annotate( + selected=ExpressionWrapper(~Q(pk__in=[]), output_field=BooleanField()), + ).aggregate(Sum('selected')) + self.assertEqual(qs['selected__sum'], Book.objects.count()) + def test_empty_queryset_annotation(self): qs = Author.objects.annotate( empty=Subquery(Author.objects.values('id').none())