Added a `QuerySet.ordered` property to check if a queryset is already ordered. Refs #10163.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10623 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/regressiontests/queries/tests.py b/tests/regressiontests/queries/tests.py
new file mode 100644
index 0000000000..5699b60241
--- /dev/null
+++ b/tests/regressiontests/queries/tests.py
@@ -0,0 +1,27 @@
+import unittest
+from models import Tag, Annotation
+from django.db.models import Count
+
+class QuerysetOrderedTests(unittest.TestCase):
+    """
+    Tests for the Queryset.ordered attribute.
+    """
+    
+    def test_no_default_or_explicit_ordering(self):
+        self.assertEqual(Annotation.objects.all().ordered, False)
+
+    def test_cleared_default_ordering(self):
+        self.assertEqual(Tag.objects.all().ordered, True)
+        self.assertEqual(Tag.objects.all().order_by().ordered, False)
+        
+    def test_explicit_ordering(self):
+        self.assertEqual(Annotation.objects.all().order_by('id').ordered, True)
+        
+    def test_order_by_extra(self):
+        self.assertEqual(Annotation.objects.all().extra(order_by=['id']).ordered, True)
+        
+    def test_annotated_ordering(self):
+        qs = Annotation.objects.annotate(num_notes=Count('notes'))
+        self.assertEqual(qs.ordered, False)
+        self.assertEqual(qs.order_by('num_notes').ordered, True)
+        
\ No newline at end of file