Branch: refs/heads/stable/1.7.x
Home: https://github.com/django/django
Commit: 4b53bfff3714d1f6f0f830d56fff296fb57b21da
https://github.com/django/django/commit/4b53bfff3714d1f6f0f830d56fff296fb57b21da
Author: Anssi Kääriäinen <[email protected]>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M tests/generic_relations/tests.py
Log Message:
-----------
[1.7.x] Fixed #22992 -- regression in .filter(generic_fk=...) error message
Generic Foreign Keys can't be used as lhs in lookups for historical
reasons. Django 1.6 gave a FieldDoesNotExist exception when using GFKs
as lhs in lookups, but due to regression caused by lookup refactor patch
(20bab2cf9d02a5c6477d8aac066a635986e0d3f3) the exception type was
changed to AttributeError.
It might be a good idea to add support for gfk__exact and gfk__in lookups
later on.
Thanks to [email protected] for the report. The code in this commit
was written by Tim Graham.
Backport of efe87d3e48 from master
Commit: 6d5238f6c873f8ad652ee206b88849a50e68accc
https://github.com/django/django/commit/6d5238f6c873f8ad652ee206b88849a50e68accc
Author: Huu Nguyen <[email protected]>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M django/core/management/commands/makemigrations.py
A
tests/migrations/migrations_test_apps/unspecified_app_with_conflict/__init__.py
A
tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0001_initial.py
A
tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_conflicting_second.py
A
tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_second.py
A
tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/__init__.py
A
tests/migrations/migrations_test_apps/unspecified_app_with_conflict/models.py
M tests/migrations/test_commands.py
Log Message:
-----------
[1.7.x] Fixed #22791 -- Invoke interactive questioner only for conflicts in
specified apps.
Thanks bendavis78 for the report and Tim Graham for the review.
Backport of f7a78f9bba from master
Compare: https://github.com/django/django/compare/572885729e02...6d5238f6c873
--
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 [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/django-updates/53c40e25e91ea_2ab068fd4458839%40hookshot-fe2-cp1-prd.iad.github.net.mail.
For more options, visit https://groups.google.com/d/optout.
