Changeset 7636

Timestamp:

06/15/08 01:24:41 (5 months ago)

Author:

russellm

Message:

Fixed #7256 -- Corrected queryset code to return the correct set of columns when the query has an empty values() clause as well as extra selects from an extra() clause. Thanks to Nicolas Lara for the report and patch.

Files:

• django/trunk/django/db/models/query.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (1 diff)

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

@@ -514 +514 @@
-
-    def iterator(self):
-
+
+
+
-        names = self.query.extra_select.keys() + self.field_names
-        for row in self.query.results_iter():

django/trunk/tests/regressiontests/queries/models.py

@@ -507 +507 @@
->>> [sorted(d.items()) for d in dicts]
-[[('id', 1), ('rank', 2)], [('id', 2), ('rank', 1)], [('id', 3), ('rank', 3)]]
+
+Bug #7256
+# An empty values() call includes all aliases, including those from an extra()
+>>> dicts = qs.values().order_by('id')
+>>> [sorted(d.items()) for d in dicts]
+[[('author_id', 2), ('good', 0), ('id', 1), ('rank', 2)], [('author_id', 3), ('good', 0), ('id', 2), ('rank', 1)], [('author_id', 1), ('good', 1), ('id', 3), ('rank', 3)]]
-
-Bugs #2874, #3002