Ticket #14930: extra_order_by_values_list-17428.2.diff

django/db/models/query.py

@@ -981 +981 @@
             self.extra_names = None
             self.field_names = [f.attname for f in self.model._meta.fields]
             self.aggregate_names = None
-
+        
         self.query.select = []
-        if self.extra_names is not None:
-            self.query.set_extra_mask(self.extra_names)
+        extra_mask_names = self.extra_names + list(self.query.extra_order_by or [])
+        if extra_mask_names is not None:
+            self.query.set_extra_mask(extra_mask_names)
         self.query.add_fields(self.field_names, True)
         if self.aggregate_names is not None:
             self.query.set_aggregate_mask(self.aggregate_names)
@@ -1059 +1060 @@
     def iterator(self):
         if self.flat and len(self._fields) == 1:
             for row in self.query.get_compiler(self.db).results_iter():
-                yield row[0]
+                yield row[len(self.query.extra_select_mask)]
         elif not self.query.extra_select and not self.query.aggregate_select:
             for row in self.query.get_compiler(self.db).results_iter():
                 yield tuple(row)