Ticket #17429: bug_17429.patch

django/db/models/sql/compiler.py

@@ -309 +309 @@
         elif not self.query.default_ordering:
             ordering = self.query.order_by
         else:
-            ordering = self.query.order_by or self.query.model._meta.ordering
+            ordering = self.query.order_by or self.query.model._meta.ordering or ()
         qn = self.quote_name_unless_alias
         qn2 = self.connection.ops.quote_name
         distinct = self.query.distinct

tests/regressiontests/queries/tests.py

@@ -826 +826 @@
             1
         )
 
+    def test_ticket17429(self):
+        original_ordering = Tag._meta.ordering
+        try:
+            Tag._meta.ordering = None
+            self.assertQuerysetEqual(
+                Tag.objects.all(),
+                ['<Tag: t1>', '<Tag: t2>', '<Tag: t3>', '<Tag: t4>', '<Tag: t5>'],
+            )
+        finally:
+            Tag._meta.ordering = original_ordering
 
 class Queries2Tests(TestCase):
     def setUp(self):