Branch: refs/heads/stable/1.5.x
Home: https://github.com/django/django
Commit: b495c24375aa1fe0373727511cf81298337a1227
https://github.com/django/django/commit/b495c24375aa1fe0373727511cf81298337a1227
Author: Tai Lee <tai....@3030.com.au>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M django/db/models/sql/compiler.py
M tests/modeltests/defer/models.py
M tests/modeltests/defer/tests.py
Log Message:
-----------
[1.5.x] Fixed #16436 -- defer + annotate + select_related crash
Correctly calculate the ``aggregate_start`` offset from loaded fields,
if any are deferred, instead of ``self.query.select`` which includes all
fields on the model.
Backpatch of 69f7db153d8108dcef033207d49f4c80febf3d70 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/52553673793be_1b72d87d5456721%40hookshot-fe2-pe1-prd.aws.github.net.mail.
For more options, visit https://groups.google.com/groups/opt_out.
