diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-09-14 20:07:44 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-09-14 20:08:18 +0200 |
| commit | a3bb80dc3186bd4d11b7864268beb88595ab00fd (patch) | |
| tree | bb62f9b075d88e2a1c853e358f84cb4ae518b0e7 /tests | |
| parent | 462d7837f93c02f0812368737294c9fde997229f (diff) | |
[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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/queries/tests.py | 10 |
1 files changed, 10 insertions, 0 deletions
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): |