mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-20 14:20:44 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Reordered condition to avoid calling allow_migrate() if unneeded.

Browse Source 
Backport of 82aca216e130973d142473ebb4b22d1eae146ec7 from master
This commit is contained in:
twidi 2014-11-15 15:52:35 +01:00 committed by Tim Graham
parent 5a6d6c5e0b
commit 4fbeec5631
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/migrations/operations/base.py
View File

@ -104,10 +104,10 @@ class Operation(object):
if it's a proxy, if it's managed, and if it's swapped out. if it's a proxy, if it's managed, and if it's swapped out.
""" """
return ( return (
router.allow_migrate(connection_alias, model) and
not model._meta.proxy and not model._meta.proxy and
not model._meta.swapped and not model._meta.swapped and
model._meta.managed model._meta.managed and
router.allow_migrate(connection_alias, model)
) )
def __repr__(self): def __repr__(self):