test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix soft-apply detection of migrations with dependencies

This commit is contained in:
Andrew Godwin 2014-01-24 12:26:19 +00:00
parent 78a2617703
commit 4b3b25104d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/migrations/executor.py
View File

@ -85,7 +85,7 @@ class MigrationExecutor(object):
self.progress_callback("apply_start", migration, fake) self.progress_callback("apply_start", migration, fake)
if not fake: if not fake:
# Test to see if this is an already-applied initial migration # Test to see if this is an already-applied initial migration
if not migration.dependencies and self.detect_soft_applied(migration): if self.detect_soft_applied(migration):
fake = True fake = True
else: else:
# Alright, do it normally # Alright, do it normally
@ -135,4 +135,6 @@ class MigrationExecutor(object):
model = apps.get_model(migration.app_label, operation.name) model = apps.get_model(migration.app_label, operation.name)
if model._meta.db_table not in self.connection.introspection.get_table_list(self.connection.cursor()): if model._meta.db_table not in self.connection.introspection.get_table_list(self.connection.cursor()):
return False return False
else:
return False
return True return True