From 166c0d2474a3b5e09e1dd96ec93bdbf08f0c65c2 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Tue, 17 Nov 2020 23:31:58 +0100 Subject: [3.1.x] Fixed #32200 -- Fixed grouping by ExpressionWrapper() with Q objects. Thanks Gordon Wrigley for the report. Regression in df32fd42b84cc6dbba173201f244491b0d154a63. Backport of fe9c7ded2996364f853c524b4421274717d89d5f from master --- tests/annotations/tests.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests/annotations') diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py index 06038781f2..8459a0ae8e 100644 --- a/tests/annotations/tests.py +++ b/tests/annotations/tests.py @@ -199,6 +199,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')) -- cgit v1.3