From f287bec5833d75750fa6368bc2802741b7924533 Mon Sep 17 00:00:00 2001 From: Markus Holtermann Date: Thu, 12 Feb 2015 12:48:28 +0100 Subject: Fixed #24184 -- Prevented automatic soft-apply of migrations Previously Django only checked for the table name in CreateModel operations in initial migrations and faked the migration automatically. This led to various errors and unexpected behavior. The newly introduced --fake-initial flag to the migrate command must be passed to get the same behavior again. With this change Django will bail out in with a "duplicate relation / table" error instead. Thanks Carl Meyer and Tim Graham for the documentation update, report and review. --- django/db/migrations/executor.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'django/db/migrations/executor.py') diff --git a/django/db/migrations/executor.py b/django/db/migrations/executor.py index 8a55ed0d69..d1a8dd64dc 100644 --- a/django/db/migrations/executor.py +++ b/django/db/migrations/executor.py @@ -62,7 +62,7 @@ class MigrationExecutor(object): applied.add(migration) return plan - def migrate(self, targets, plan=None, fake=False): + def migrate(self, targets, plan=None, fake=False, fake_initial=False): """ Migrates the database up to the given targets. @@ -91,7 +91,7 @@ class MigrationExecutor(object): # Phase 2 -- Run the migrations for migration, backwards in plan: if not backwards: - self.apply_migration(states[migration], migration, fake=fake) + self.apply_migration(states[migration], migration, fake=fake, fake_initial=fake_initial) else: self.unapply_migration(states[migration], migration, fake=fake) @@ -113,18 +113,19 @@ class MigrationExecutor(object): statements.extend(schema_editor.collected_sql) return statements - def apply_migration(self, state, migration, fake=False): + def apply_migration(self, state, migration, fake=False, fake_initial=False): """ Runs a migration forwards. """ if self.progress_callback: self.progress_callback("apply_start", migration, fake) if not fake: - # Test to see if this is an already-applied initial migration - applied, state = self.detect_soft_applied(state, migration) - if applied: - fake = True - else: + if fake_initial: + # Test to see if this is an already-applied initial migration + applied, state = self.detect_soft_applied(state, migration) + if applied: + fake = True + if not fake: # Alright, do it normally with self.connection.schema_editor() as schema_editor: state = migration.apply(state, schema_editor) -- cgit v1.3