diff options
| author | Markus Holtermann <info@markusholtermann.eu> | 2016-02-10 15:44:04 +1100 |
|---|---|---|
| committer | Markus Holtermann <info@markusholtermann.eu> | 2016-02-12 14:31:27 +1100 |
| commit | 18afd50a2beae2e72cfc4841a6b80f253fe52a1b (patch) | |
| tree | 2288ee0a0b27d5de72f74e2eecd51f52644111e5 | |
| parent | 228427ab1ab6aaafed4eacfb532f7ddb6cc1ed6c (diff) | |
Updated allow_migrate() signature in check framework tests
| -rw-r--r-- | django/db/models/fields/__init__.py | 2 | ||||
| -rw-r--r-- | tests/check_framework/test_multi_db.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 56ab438d75..3e7bd3067a 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -313,7 +313,7 @@ class Field(RegisterLookupMixin): def _check_backend_specific_checks(self, **kwargs): app_label = self.model._meta.app_label for db in connections: - if router.allow_migrate(db, app_label, model=self.model): + if router.allow_migrate(db, app_label, model_name=self.model._meta.model_name): return connections[db].validation.check_field(self, **kwargs) return [] diff --git a/tests/check_framework/test_multi_db.py b/tests/check_framework/test_multi_db.py index bfbeab0029..f273d397e2 100644 --- a/tests/check_framework/test_multi_db.py +++ b/tests/check_framework/test_multi_db.py @@ -7,8 +7,8 @@ class TestRouter(object): """ Routes to the 'other' database if the model name starts with 'Other'. """ - def allow_migrate(self, db, app_label, model=None, **hints): - return db == ('other' if model._meta.verbose_name.startswith('other') else 'default') + def allow_migrate(self, db, app_label, model_name=None, **hints): + return db == ('other' if model_name.startswith('other') else 'default') @override_settings(DATABASE_ROUTERS=[TestRouter()]) |
