summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2015-02-12 12:48:28 +0100
committerMarkus Holtermann <info@markusholtermann.eu>2015-02-13 14:29:59 +0100
commitf287bec5833d75750fa6368bc2802741b7924533 (patch)
tree9ab7db3bc9a1834ead7366c0062b9fb39f457648 /django/core
parentb4e1090ab28c0e731157a61a91a6875bad392307 (diff)
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.
Diffstat (limited to 'django/core')
-rw-r--r--django/core/management/commands/migrate.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py
index d1aff756f0..5dc7dc00f7 100644
--- a/django/core/management/commands/migrate.py
+++ b/django/core/management/commands/migrate.py
@@ -40,6 +40,10 @@ class Command(BaseCommand):
'Defaults to the "default" database.')
parser.add_argument('--fake', action='store_true', dest='fake', default=False,
help='Mark migrations as run without actually running them')
+ parser.add_argument('--fake-initial', action='store_true', dest='fake_initial', default=False,
+ help='Detect if tables already exist and fake-apply initial migrations if so. Make sure '
+ 'that the current database schema matches your initial migration before using this '
+ 'flag. Django will only check for an existing table name.')
parser.add_argument('--list', '-l', action='store_true', dest='list', default=False,
help='Show a list of all known migrations and which are applied')
@@ -186,7 +190,9 @@ class Command(BaseCommand):
"apply them."
))
else:
- executor.migrate(targets, plan, fake=options.get("fake", False))
+ fake = options.get("fake")
+ fake_initial = options.get("fake_initial")
+ executor.migrate(targets, plan, fake=fake, fake_initial=fake_initial)
# Send the post_migrate signal, so individual apps can do whatever they need
# to do at this point.