diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-10-08 09:45:27 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-10-08 09:45:27 +0000 |
| commit | 559aca7d78cd6f0c24260ba9197579b2c9c53bd2 (patch) | |
| tree | f224a5f775982110f2dfdfa68e36f1a7c9803f3e /django/db/models/sql/query.py | |
| parent | 44f228fd61e5f45dbdfa465291319dfd5dd66393 (diff) | |
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 9ac0d0c960..01fbd3d002 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -608,7 +608,7 @@ class Query(object): if self.extra_order_by: ordering = self.extra_order_by elif not self.default_ordering: - ordering = [] + ordering = self.order_by else: ordering = self.order_by or self.model._meta.ordering qn = self.quote_name_unless_alias |