Fixed #10064 -- Corrected handling of aggregate queries that also use select_related(). Thanks to olivius for the report.

freakboy3742 · freakboy3742 · commit 39516803f1e5 · 2009-01-20T12:23:48.000Z
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
@@ -250,11 +250,12 @@ def results_iter(self):
 
                 if self.aggregate_select:
                     aggregate_start = len(self.extra_select.keys()) + len(self.select)
+                    aggregate_end = aggregate_start + len(self.aggregate_select)
                     row = tuple(row[:aggregate_start]) + tuple([
                         self.resolve_aggregate(value, aggregate)
                         for (alias, aggregate), value
-                        in zip(self.aggregate_select.items(), row[aggregate_start:])
-                    ])
+                        in zip(self.aggregate_select.items(), row[aggregate_start:aggregate_end])
+                    ]) + tuple(row[aggregate_end:])
 
                 yield row
 
diff --git a/tests/regressiontests/aggregation_regress/models.py b/tests/regressiontests/aggregation_regress/models.py
@@ -147,6 +147,9 @@ def __unicode__(self):
 >>> Book.objects.aggregate(number=Max('pages'), select=Max('pages'))
 {'number': 1132, 'select': 1132}
 
+# Regression for #10064: select_related() plays nice with aggregates
+>>> Book.objects.select_related('publisher').annotate(num_authors=Count('authors')).values()[0]
+{'rating': 4.0, 'isbn': u'013790395', 'name': u'Artificial Intelligence: A Modern Approach', 'pubdate': datetime.date(1995, 1, 15), 'price': Decimal("82.8..."), 'id': 5, 'num_authors': 2, 'publisher_id': 3, 'pages': 1132}
 
 """
 }

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,9 @@ def __unicode__(self):`
`147`	`147`	`>>> Book.objects.aggregate(number=Max('pages'), select=Max('pages'))`
`148`	`148`	`{'number': 1132, 'select': 1132}`
`149`	`149`
	`150`	`+# Regression for #10064: select_related() plays nice with aggregates`
	`151`	`+>>> Book.objects.select_related('publisher').annotate(num_authors=Count('authors')).values()[0]`
	`152`	`+{'rating': 4.0, 'isbn': u'013790395', 'name': u'Artificial Intelligence: A Modern Approach', 'pubdate': datetime.date(1995, 1, 15), 'price': Decimal("82.8..."), 'id': 5, 'num_authors': 2, 'publisher_id': 3, 'pages': 1132}`
`150`	`153`
`151`	`154`	`"""`
`152`	`155`	`}`