Changeset 4475

Timestamp:

02/09/07 23:38:38 (2 years ago)

Author:

adrian

Message:

Fixed #3463 -- EmptyQuerySet?'s iterator() now returns a generator. Thanks, Gary Wilson

Files:

• django/trunk/django/db/models/query.py (modified) (5 diffs)
• django/trunk/tests/modeltests/lookup/models.py (modified) (1 diff)

django/trunk/django/db/models/query.py

@@ -168 +168 @@
-    def iterator(self):
-        "Performs the SELECT database lookup of this QuerySet."
-        # self._select is a dictionary, and dictionaries' key order is
-        # undefined, so we convert it to a list of tuples.
-        extra_select = self._select.items()
-
-        cursor = connection.cursor()
-        
-        try:
-            select, sql, params = self._get_sql_clause()
-        except EmptyResultSet:
-            raise StopIteration
-
+
+
+
+
+
+
-        cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
-        fill_cache = self._select_related
@@ -524 +523 @@
-
-class ValuesQuerySet(QuerySet):
-
+
+
-        # select_related and select aren't supported in values().
-        self._select_related = False
-        self._select = {}
+
+    def iterator(self):
+        try:
+            select, sql, params = self._get_sql_clause()
+        except EmptyResultSet:
+            raise StopIteration
-
-        # self._fields is a list of field names to fetch.
@@ -536 +542 @@
-            columns = [f.column for f in self.model._meta.fields]
-            field_names = [f.attname for f in self.model._meta.fields]
-
-        cursor = connection.cursor()
-        
-        try:
-            select, sql, params = self._get_sql_clause()
-        except EmptyResultSet:
-            raise StopIteration
-        
-        select = ['%s.%s' % (backend.quote_name(self.model._meta.db_table), backend.quote_name(c)) for c in columns]
+        cursor = connection.cursor()
-        cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
-        while 1:
@@ -593 +593 @@
-        self._result_cache = []
-        
-    def iterator(self):
-        raise StopIteration
-        
-    def count(self):
-        return 0
@@ -606 +603 @@
-        c._result_cache = []
-        return c
+
+    def _get_sql_clause(self):
+        raise EmptyResultSet
-
-class QOperator(object):

django/trunk/tests/modeltests/lookup/models.py

@@ -199 +199 @@
->>> Article.objects.none().count()
-0
+>>> [article for article in Article.objects.none().iterator()]
+[]
-
-# using __in with an empty list should return an empty query set