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

Fixed #24703 -- Changed squashmigrations to use a MigrationLoader 

Changed squashmigrations to not instantiate a MigrationExecutor,
but to directly use a MigrationLoader instance instead.
This commit is contained in:
Marten Kenbeek 2015-04-25 16:18:41 +02:00 committed by Markus Holtermann
parent 0cf7477ed8
commit 1521861b3c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/core/management/commands/squashmigrations.py
View File

@ -1,8 +1,7 @@
from django.conf import settings from django.conf import settings
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.db import DEFAULT_DB_ALIAS, connections, migrations from django.db import DEFAULT_DB_ALIAS, connections, migrations
from django.db.migrations.executor import MigrationExecutor from django.db.migrations.loader import AmbiguityError, MigrationLoader
from django.db.migrations.loader import AmbiguityError
from django.db.migrations.migration import SwappableTuple from django.db.migrations.migration import SwappableTuple
from django.db.migrations.optimizer import MigrationOptimizer from django.db.migrations.optimizer import MigrationOptimizer
from django.db.migrations.writer import MigrationWriter from django.db.migrations.writer import MigrationWriter
@ -32,14 +31,14 @@ class Command(BaseCommand):
no_optimize = options['no_optimize'] no_optimize = options['no_optimize']
# Load the current graph state, check the app and migration they asked for exists # Load the current graph state, check the app and migration they asked for exists
executor = MigrationExecutor(connections[DEFAULT_DB_ALIAS]) loader = MigrationLoader(connections[DEFAULT_DB_ALIAS])
if app_label not in executor.loader.migrated_apps: if app_label not in loader.migrated_apps:
raise CommandError( raise CommandError(
"App '%s' does not have migrations (so squashmigrations on " "App '%s' does not have migrations (so squashmigrations on "
"it makes no sense)" % app_label "it makes no sense)" % app_label
) )
try: try:
migration = executor.loader.get_migration_by_prefix(app_label, migration_name) migration = loader.get_migration_by_prefix(app_label, migration_name)
except AmbiguityError: except AmbiguityError:
raise CommandError( raise CommandError(
"More than one migration matches '%s' in app '%s'. Please be " "More than one migration matches '%s' in app '%s'. Please be "
@ -53,8 +52,8 @@ class Command(BaseCommand):
# Work out the list of predecessor migrations # Work out the list of predecessor migrations
migrations_to_squash = [ migrations_to_squash = [
executor.loader.get_migration(al, mn) loader.get_migration(al, mn)
for al, mn in executor.loader.graph.forwards_plan((migration.app_label, migration.name)) for al, mn in loader.graph.forwards_plan((migration.app_label, migration.name))
if al == migration.app_label if al == migration.app_label
] ]