[django/django] b7e5b5: [1.5.x] Fixed #21126 -- QuerySet value conversion ...

[GitHub]

Branch: refs/heads/stable/1.5.x
Home: https://github.com/django/django
Commit: b7e5b5ba1ed03243f53f9f0bbaa58a33691c815d
https://github.com/django/django/commit/b7e5b5ba1ed03243f53f9f0bbaa58a33691c815d
Author: Anssi Kääriäinen <akaa...@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)

Changed paths:
M django/db/backends/__init__.py
M django/db/models/sql/compiler.py
M tests/regressiontests/aggregation_regress/tests.py

Log Message:
-----------
[1.5.x] Fixed #21126 -- QuerySet value conversion failure

A .annotate().select_related() query resulted in misaligned rows vs
columns for compiler.resolve_columns() method.

Report & patch by Michael Manfre.

Backpatch of 83554b018ef283827c0e7459ab934d447b3419d5 from master.