Ticket #7256: extra_values.diff

django/db/models/query.py

@@ -513 +513 @@
         # names of the model fields to select.
 
     def iterator(self):
-        self.query.trim_extra_select(self.extra_names)
+        if (not self.extra_names and
+            len(self.field_names) != len(self.model._meta.fields)):
+            self.query.trim_extra_select(self.extra_names)
         names = self.query.extra_select.keys() + self.field_names
         for row in self.query.results_iter():
             yield dict(zip(names, row))

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)]]
 
+# But an empty values() call includes all aliases.
+>>> qs.values().order_by('id')
+[{'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
 >>> qs = Item.objects.select_related().order_by('note__note', 'name')
 >>> list(qs)