From a3bb80dc3186bd4d11b7864268beb88595ab00fd Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 14 Sep 2020 20:07:44 +0200 Subject: [3.1.x] Fixed #31990 -- Fixed QuerySet.ordered for GROUP BY queries on models with Meta.ordering. Regression in 0ddb4ebf7bfcc4730c80a772dd146a49ef6895f6. Thanks Julien Dutriaux for the report. Backport of e11d05e0b488a3ff2b3c9d8f2e1e50f471750d6e from master --- tests/queries/tests.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tests') diff --git a/tests/queries/tests.py b/tests/queries/tests.py index faa443adb1..11d5ec11ab 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -2074,6 +2074,16 @@ class QuerysetOrderedTests(unittest.TestCase): self.assertIs(qs.ordered, False) self.assertIs(qs.order_by('num_notes').ordered, True) + def test_annotated_default_ordering(self): + qs = Tag.objects.annotate(num_notes=Count('pk')) + self.assertIs(qs.ordered, False) + self.assertIs(qs.order_by('name').ordered, True) + + def test_annotated_values_default_ordering(self): + qs = Tag.objects.values('name').annotate(num_notes=Count('pk')) + self.assertIs(qs.ordered, False) + self.assertIs(qs.order_by('name').ordered, True) + @skipUnlessDBFeature('allow_sliced_subqueries_with_in') class SubqueryTests(TestCase): -- cgit v1.3