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 <akaar...@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.
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to django-updates+unsubscr...@googlegroups.com.
To post to this group, send email to django-updates@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/django-updates/524323332cd0f_76dc659d48915ab%40hookshot-fe2-pe1-prd.aws.github.net.mail.
For more options, visit https://groups.google.com/groups/opt_out.
