p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated allow_migrate() signature in check framework tests

This commit is contained in:
Markus Holtermann 2016-02-10 15:44:04 +11:00
parent 228427ab1a
commit 18afd50a2b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/fields/__init__.py
View File

@ -313,7 +313,7 @@ class Field(RegisterLookupMixin):
def _check_backend_specific_checks(self, **kwargs): def _check_backend_specific_checks(self, **kwargs):
app_label = self.model._meta.app_label app_label = self.model._meta.app_label
for db in connections: 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 connections[db].validation.check_field(self, **kwargs)
return [] return []

4
tests/check_framework/test_multi_db.py
View File

@ -7,8 +7,8 @@ class TestRouter(object):
""" """
Routes to the 'other' database if the model name starts with 'Other'. Routes to the 'other' database if the model name starts with 'Other'.
""" """
def allow_migrate(self, db, app_label, model=None, **hints): def allow_migrate(self, db, app_label, model_name=None, **hints):
return db == ('other' if model._meta.verbose_name.startswith('other') else 'default') return db == ('other' if model_name.startswith('other') else 'default')
@override_settings(DATABASE_ROUTERS=[TestRouter()]) @override_settings(DATABASE_ROUTERS=[TestRouter()])