mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging.

Browse Source 
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddb from master
This commit is contained in:
John Giannelos
2015-03-03 00:13:14 +02:00
committed by Tim Graham
parent eaf86858d4
commit cb48e192fb
3 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
django/core/management/commands/makemigrations.py
View File

@@ -219,7 +219,18 @@ class Command(BaseCommand):
})
new_migration = subclass("%04i_merge" % (biggest_number + 1), app_label)
writer = MigrationWriter(new_migration)
with open(writer.path, "wb") as fh:
fh.write(writer.as_string())
if self.verbosity > 0:
self.stdout.write("\nCreated new merge migration %s" % writer.path)
if not self.dry_run:
# Write the merge migrations file to the disk
with open(writer.path, "wb") as fh:
fh.write(writer.as_string())
if self.verbosity > 0:
self.stdout.write("\nCreated new merge migration %s" % writer.path)
elif self.verbosity == 3:
# Alternatively, makemigrations --merge --dry-run --verbosity 3
# will output the merge migrations to stdout rather than saving
# the file to the disk.
self.stdout.write(self.style.MIGRATE_HEADING(
"Full merge migrations file '%s':" % writer.filename) + "\n"
)
self.stdout.write("%s\n" % writer.as_string())