Changeset 9207

Timestamp:

10/08/08 04:48:21 (3 months ago)

Author:

mtredinnick

Message:

[1.0.X] A queryset that has had ordering removed (order_by()) can have ordering
added again later (order_by('foo')). Or, at least, it can now. Thanks to Ilya
Novoselov for diagnosing the problem here.

Backport of r9206 from trunk.

Files:

• django/branches/releases/1.0.X/django/db/models/sql/query.py (modified) (1 diff)
• django/branches/releases/1.0.X/tests/regressiontests/queries/models.py (modified) (1 diff)

django/branches/releases/1.0.X/django/db/models/sql/query.py

@@ -609 +609 @@
-            ordering = self.extra_order_by
-        elif not self.default_ordering:
-[]
+self.order_by
-        else:
-            ordering = self.order_by or self.model._meta.ordering

django/branches/releases/1.0.X/tests/regressiontests/queries/models.py

@@ -974 +974 @@
->>> print query.as_sql()[0]
-SELECT U0."id" FROM "queries_tag" U0
+
+Calling order_by() with no parameters removes any existing ordering on the
+model. But it should still be possible to add new ordering after that.
+>>> qs = Author.objects.order_by().order_by('name')
+>>> 'ORDER BY' in qs.query.as_sql()[0]
+True
-"""}
-