diff options
| author | twidi <s.angel@twidi.com> | 2014-11-15 15:52:35 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-11-17 18:32:42 +0100 |
| commit | 82aca216e130973d142473ebb4b22d1eae146ec7 (patch) | |
| tree | 2faa6278122a1babf2a3155c2f381f92a6d14cc3 | |
| parent | 8fce7978307058f9bc7d9f815858f27fdd954409 (diff) | |
Reordered condition to avoid calling allow_migrate() if unneeded.
| -rw-r--r-- | django/db/migrations/operations/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/migrations/operations/base.py b/django/db/migrations/operations/base.py index d3af9c5903..8d2c491add 100644 --- a/django/db/migrations/operations/base.py +++ b/django/db/migrations/operations/base.py @@ -104,10 +104,10 @@ class Operation(object): if it's a proxy, if it's managed, and if it's swapped out. """ return ( - router.allow_migrate(connection_alias, model) and not model._meta.proxy and not model._meta.swapped and - model._meta.managed + model._meta.managed and + router.allow_migrate(connection_alias, model) ) def __repr__(self): |