test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #25250 -- Clarified partially recorded state of squashed migrations in showmigrations --list.

This commit is contained in:
Jacob Walls 2021-06-10 11:15:32 -04:00 committed by Mariusz Felisiak
parent de4f620183
commit 2dfc1066a0
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/core/management/commands/showmigrations.py
View File

@ -4,6 +4,7 @@ from django.apps import apps
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
from django.db import DEFAULT_DB_ALIAS, connections from django.db import DEFAULT_DB_ALIAS, connections
from django.db.migrations.loader import MigrationLoader from django.db.migrations.loader import MigrationLoader
from django.db.migrations.recorder import MigrationRecorder
class Command(BaseCommand): class Command(BaseCommand):
@ -69,6 +70,8 @@ class Command(BaseCommand):
""" """
# Load migrations from disk/DB # Load migrations from disk/DB
loader = MigrationLoader(connection, ignore_no_migrations=True) loader = MigrationLoader(connection, ignore_no_migrations=True)
recorder = MigrationRecorder(connection)
recorded_migrations = recorder.applied_migrations()
graph = loader.graph graph = loader.graph
# If we were passed a list of apps, validate it # If we were passed a list of apps, validate it
if app_names: if app_names:
@ -91,7 +94,11 @@ class Command(BaseCommand):
applied_migration = loader.applied_migrations.get(plan_node) applied_migration = loader.applied_migrations.get(plan_node)
# Mark it as applied/unapplied # Mark it as applied/unapplied
if applied_migration: if applied_migration:
output = ' [X] %s' % title if plan_node in recorded_migrations:
output = ' [X] %s' % title
else:
title += " Run 'manage.py migrate' to finish recording."
output = ' [-] %s' % title
if self.verbosity >= 2 and hasattr(applied_migration, 'applied'): if self.verbosity >= 2 and hasattr(applied_migration, 'applied'):
output += ' (applied at %s)' % applied_migration.applied.strftime('%Y-%m-%d %H:%M:%S') output += ' (applied at %s)' % applied_migration.applied.strftime('%Y-%m-%d %H:%M:%S')
self.stdout.write(output) self.stdout.write(output)

9
tests/migrations/test_commands.py
View File

@ -928,6 +928,15 @@ class MigrateTests(MigrationTestBase):
recorder = MigrationRecorder(connection) recorder = MigrationRecorder(connection)
recorder.record_applied("migrations", "0001_initial") recorder.record_applied("migrations", "0001_initial")
recorder.record_applied("migrations", "0002_second") recorder.record_applied("migrations", "0002_second")
out = io.StringIO()
call_command('showmigrations', 'migrations', stdout=out, no_color=True)
self.assertEqual(
"migrations\n"
" [-] 0001_squashed_0002 (2 squashed migrations) "
"run 'manage.py migrate' to finish recording.\n",
out.getvalue().lower(),
)
out = io.StringIO() out = io.StringIO()
call_command("migrate", "migrations", verbosity=0) call_command("migrate", "migrations", verbosity=0)
call_command("showmigrations", "migrations", stdout=out, no_color=True) call_command("showmigrations", "migrations", stdout=out, no_color=True)