From e4112922f7f5edda46625e72018d9fda41dc30a7 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Mon, 30 Jan 2006 03:51:10 +0000
Subject: [PATCH] magic-removal: Fixed subtle bug in QuerySet ordering -- now,
 if _order_by is an empty sequence, no ordering will be done. If it's None, it
 will use the model's ordering setting

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/models/query.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/django/db/models/query.py b/django/db/models/query.py
index 92d6df4fc9..7d5f6b7c27 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -69,7 +69,7 @@ class QuerySet(object):
 
     def __init__(self):
         self._filters = self.core_filters.copy()
-        self._order_by = ()          # Ordering, e.g. ('date', '-name')
+        self._order_by = None        # Ordering, e.g. ('date', '-name'). If None, use model's ordering.
         self._select_related = False # Whether to fill cache for related objects.
         self._distinct = False       # Whether the query should use SELECT DISTINCT.
         self._select = None          # Dictionary of attname -> SQL.
@@ -135,11 +135,11 @@ class QuerySet(object):
     def count(self):
         "Performs a SELECT COUNT() and returns the number of records as an integer."
         counter = self._clone()
-        counter._order_by = []
+        counter._order_by = ()
         counter._offset = None
         counter._limit = None
         counter._select_related = False
-        _, sql, params = counter._get_sql_clause(True)
+        select, sql, params = counter._get_sql_clause(True)
         cursor = connection.cursor()
         cursor.execute("SELECT COUNT(*)" + sql, params)
         return cursor.fetchone()[0]
@@ -277,7 +277,11 @@ class QuerySet(object):
 
         # ORDER BY clause
         order_by = []
-        for f in handle_legacy_orderlist(self._order_by or opts.ordering):
+        if self._order_by is not None:
+            ordering_to_use = self._order_by
+        else:
+            ordering_to_use = opts.ordering
+        for f in handle_legacy_orderlist(ordering_to_use):
             if f == '?': # Special case.
                 order_by.append(backend.get_random_function_sql())
             else: