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

Fix soft_applied in a way that doesn't break tests

This commit is contained in:
Andrew Godwin 2014-07-29 09:24:07 -07:00
parent 5ed3834cbe
commit 4418559138
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,6 +134,10 @@ class MigrationExecutor(object):
project_state = self.loader.project_state((migration.app_label, migration.name), at_end=True) project_state = self.loader.project_state((migration.app_label, migration.name), at_end=True)
apps = project_state.render() apps = project_state.render()
found_create_migration = False found_create_migration = False
# Bail if the migration isn't the first one in its app
if [name for app, name in migration.dependencies if app == migration.app_label]:
return False
# Make sure all create model are done
for operation in migration.operations: for operation in migration.operations:
if isinstance(operation, migrations.CreateModel): if isinstance(operation, migrations.CreateModel):
model = apps.get_model(migration.app_label, operation.name) model = apps.get_model(migration.app_label, operation.name)
@ -144,8 +148,6 @@ class MigrationExecutor(object):
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
found_create_migration = True found_create_migration = True
else:
return False
# If we get this far and we found at least one CreateModel migration, # If we get this far and we found at least one CreateModel migration,
# the migration is considered implicitly applied. # the migration is considered implicitly applied.
return found_create_migration return found_create_migration