summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2020-09-14 20:07:44 +0200
committerGitHub <noreply@github.com>2020-09-14 20:07:44 +0200
commite11d05e0b488a3ff2b3c9d8f2e1e50f471750d6e (patch)
treea37382769da0d54ae0a05cd310edc139f2f26ea3 /tests
parent5fab16392fc00702a5d0288378892ec48fe67dc6 (diff)
Fixed #31990 -- Fixed QuerySet.ordered for GROUP BY queries on models with Meta.ordering.
Regression in 0ddb4ebf7bfcc4730c80a772dd146a49ef6895f6. Thanks Julien Dutriaux for the report.
Diffstat (limited to 'tests')
-rw-r--r--tests/queries/tests.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/queries/tests.py b/tests/queries/tests.py
index f9a57b088a..428153402f 100644
--- a/tests/queries/tests.py
+++ b/tests/queries/tests.py
@@ -2084,6 +2084,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):