mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-29 00:26:07 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #10127 -- Corrected handling of select_related() in annotate() calls. Thanks to Sylvain Pasche <sylvain.pasche@gmail.com> for the report and test case.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2009-02-02 13:43:18 +00:00
parent 65ad2132ab
commit 8f410a577b
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/query.py
View File

@@ -280,8 +280,8 @@ class QuerySet(object):
for row in self.query.results_iter():
if fill_cache:
obj, aggregate_start = get_cached_row(self.model, row,
index_start, max_depth, requested=requested)
obj, _ = get_cached_row(self.model, row,
index_start, max_depth, requested=requested)
else:
# omit aggregates in object creation
obj = self.model(*row[index_start:aggregate_start])