[django/django] c38925: [1.7.x] Fixed #22648 -- Transform.output_type shou...

[GitHub]

Branch: refs/heads/stable/1.7.X
Home: https://github.com/django/django
Commit: c38925a6018a7943936d1fd2b9038ab5de406545
https://github.com/django/django/commit/c38925a6018a7943936d1fd2b9038ab5de406545
Author: Marc Tamlyn <marc....@gmail.com>
Date: 2014-05-19 (Mon, 19 May 2014)

Changed paths:
M django/db/models/lookups.py
M tests/custom_lookups/tests.py

Log Message:
-----------
[1.7.x] Fixed #22648 -- Transform.output_type should respect overridden custom_lookup and custom_transform.

Previously, class lookups from the output_type would be used, but any
changes to custom_lookup or custom_transform would be ignored.

Backport of a2dd618 from master


Commit: 157575c7c8ad4e55b68077c2d10b41d596038e2e
https://github.com/django/django/commit/157575c7c8ad4e55b68077c2d10b41d596038e2e
Author: Marc Tamlyn <marc....@gmail.com>
Date: 2014-05-19 (Mon, 19 May 2014)

Changed paths:
M tests/custom_lookups/tests.py

Log Message:
-----------
[1.7.x] Fix a2dd618 for mysql.

Backport of 3b76502 from master


Compare: https://github.com/django/django/compare/c38925a6018a^...157575c7c8ad

[GitHub]

Branch: refs/heads/stable/1.7.x

Compare: https://github.com/django/django/compare/269291019ec2...157575c7c8ad