Changeset 6599

Timestamp:

10/23/07 08:34:03 (1 year ago)

Author:

mtredinnick

Message:

queryset-refactor: Fixed an order_by() regression. It must override any
existing ordering, not append to it.

Files:

• django/branches/queryset-refactor/django/db/models/query.py (modified) (1 diff)
• django/branches/queryset-refactor/tests/modeltests/ordering/models.py (modified) (1 diff)

django/branches/queryset-refactor/django/db/models/query.py

@@ -304 +304 @@
-                "Cannot reorder a query once a slice has been taken."
-        obj = self._clone()
+        obj.query.clear_ordering()
-        obj.query.add_ordering(*field_names)
-        return obj

django/branches/queryset-refactor/tests/modeltests/ordering/models.py

@@ -65 +65 @@
->>> Article.objects.order_by('?')
-[...]
+
+# order_by() overrides any previous ordering, so only the last one has any
+# effect.
+>>> Article.objects.order_by('id')
+[<Article: Article 1>, <Article: Article 2>, <Article: Article 3>, <Article: Article 4>]
+>>> Article.objects.order_by('id').order_by('-headline')
+[<Article: Article 4>, <Article: Article 3>, <Article: Article 2>, <Article: Article 1>]
-"""}