Ticket #14697: patch.diff

django/db/models/query.py

@@ -267 +267 @@
             model_cls = deferred_class_factory(self.model, skip)
 
         compiler = self.query.get_compiler(using=self.db)
+        db = self.db
         for row in compiler.results_iter():
             if fill_cache:
                 obj, _ = get_cached_row(self.model, row,
@@ -283 +284 @@
                     obj = self.model(*row[index_start:aggregate_start])
 
                 # Store the source database of the object
-                obj._state.db = self.db
+                obj._state.db = db
 
-            for i, k in enumerate(extra_select):
-                setattr(obj, k, row[i])
+            if extra_select:
+                for i, k in enumerate(extra_select):
+                    setattr(obj, k, row[i])
 
             # Add the aggregates to the model
-            for i, aggregate in enumerate(aggregate_select):
-                setattr(obj, aggregate, row[i+aggregate_start])
+            if aggregate_select:
+                for i, aggregate in enumerate(aggregate_select):
+                    setattr(obj, aggregate, row[i+aggregate_start])
 
             yield obj
 

django/db/models/sql/compiler.py

@@ -672 +672 @@
         """
         resolve_columns = hasattr(self, 'resolve_columns')
         fields = None
+        has_aggregate_select = bool(self.query.aggregate_select)
         for rows in self.execute_sql(MULTI):
             for row in rows:
                 if resolve_columns:
@@ -692 +693 @@
                                       f.column in only_load[db_table]]
                     row = self.resolve_columns(row, fields)
 
-                if self.query.aggregate_select:
+                if has_aggregate_select:
                     aggregate_start = len(self.query.extra_select.keys()) + len(self.query.select)
                     aggregate_end = aggregate_start + len(self.query.aggregate_select)
                     row = tuple(row[:aggregate_start]) + tuple([