innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #26492 -- Fixed "maximum recursion depth exceeded" migrate error. 

A regression introduced in 0d3c616fbb2f49fa7ff6809e5a6777275352b35b;
refs #26351.
This commit is contained in:
Berker Peksag 2016-04-11 23:15:52 +03:00 committed by Tim Graham
parent 3380169222
commit 93deb1691e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/management/commands/migrate.py
View File

@ -59,7 +59,7 @@ class Command(BaseCommand):
def _run_checks(self, **kwargs): def _run_checks(self, **kwargs):
issues = run_checks(tags=[Tags.database]) issues = run_checks(tags=[Tags.database])
issues.extend(super(Command, self).check(**kwargs)) issues.extend(super(Command, self)._run_checks(**kwargs))
return issues return issues
def handle(self, *args, **options): def handle(self, *args, **options):

10
tests/migrations/test_commands.py
View File

@ -53,6 +53,16 @@ class MigrateTests(MigrationTestBase):
self.assertTableNotExists("migrations_tribble") self.assertTableNotExists("migrations_tribble")
self.assertTableNotExists("migrations_book") self.assertTableNotExists("migrations_book")
@override_settings(INSTALLED_APPS=[
'django.contrib.auth',
'django.contrib.contenttypes',
'migrations.migrations_test_apps.migrated_app',
])
def test_migrate_with_system_checks(self):
out = six.StringIO()
call_command('migrate', skip_checks=False, no_color=True, stdout=out)
self.assertIn('Apply all migrations: migrated_app', out.getvalue())
@override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_initial_false"}) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_initial_false"})
def test_migrate_initial_false(self): def test_migrate_initial_false(self):
""" """