mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #32200 -- Fixed grouping by ExpressionWrapper() with Q objects.

Browse Source 
Thanks Gordon Wrigley for the report.

Regression in df32fd42b8.
This commit is contained in:
Hasan Ramezani
2020-11-17 23:31:58 +01:00
committed by Mariusz Felisiak
parent ead37dfb58
commit fe9c7ded29
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/annotations/tests.py
View File

@@ -195,6 +195,18 @@ class NonAggregateAnnotationTestCase(TestCase):
self.assertEqual(book.isnull_pubdate, False)
self.assertEqual(book.rating_count, 1)
@skipUnlessDBFeature('supports_boolean_expr_in_select_clause')
def test_grouping_by_q_expression_annotation(self):
authors = Author.objects.annotate(
under_40=ExpressionWrapper(Q(age__lt=40), output_field=BooleanField()),
).values('under_40').annotate(
count_id=Count('id'),
).values('under_40', 'count_id')
self.assertCountEqual(authors, [
{'under_40': False, 'count_id': 3},
{'under_40': True, 'count_id': 6},
])
def test_aggregate_over_annotation(self):
agg = Author.objects.annotate(other_age=F('age')).aggregate(otherage_sum=Sum('other_age'))
other_agg = Author.objects.aggregate(age_sum=Sum('age'))