Commit 69db1c74 authored by mlavin's avatar mlavin Committed by Tim Graham
Browse files

Fixed #25231 -- Added recording of squashed migrations in the migrate command. 

Ensured squashed migrations are recorded as applied when the
migrate command is run and all of the original migrations
have been previously applied.
parent a7b7f27c

django/core/management/commands/migrate.py

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ class Command(BaseCommand): 
        if self.verbosity >= 1:

            self.stdout.write(self.style.MIGRATE_HEADING("Running migrations:"))

        if not plan:

            executor.check_replacements()

            if self.verbosity >= 1:

                self.stdout.write("  No migrations to apply.")

                # If there's changes that aren't in migrations yet, tell them how to fix it.

docs/releases/1.8.4.txt

+3 −0
Original line number Diff line number Diff line
@@ -24,3 +24,6 @@ Bugfixes 


* Fixed ``has_changed()`` method in ``contrib.postgres.forms.HStoreField``

  (:ticket:`25215`, :ticket:`25233`).



* Fixed the recording of squashed migrations when running the ``migrate``

  command (:ticket:`25231`).

tests/migrations/test_commands.py

+46 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import os 
from django.apps import apps

from django.core.management import CommandError, call_command

from django.db import DatabaseError, connection, models

from django.db.migrations.recorder import MigrationRecorder

from django.test import ignore_warnings, mock, override_settings

from django.utils import six

from django.utils.deprecation import RemovedInDjango110Warning
@@ -413,6 +414,51 @@ class MigrateTests(MigrationTestBase): 
        """

        call_command("migrate", "migrated_unapplied_app", stdout=six.StringIO())



    @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"})

    def test_migrate_record_replaced(self):

        """

        Running a single squashed migration should record all of the original

        replaced migrations as run.

        """

        recorder = MigrationRecorder(connection)

        out = six.StringIO()

        call_command("migrate", "migrations", verbosity=0)

        call_command("showmigrations", "migrations", stdout=out, no_color=True)

        self.assertEqual(

            'migrations\n'

            ' [x] 0001_squashed_0002 (2 squashed migrations)\n',

            out.getvalue().lower()

        )

        applied_migrations = recorder.applied_migrations()

        self.assertIn(("migrations", "0001_initial"), applied_migrations)

        self.assertIn(("migrations", "0002_second"), applied_migrations)

        self.assertIn(("migrations", "0001_squashed_0002"), applied_migrations)

        # Rollback changes

        call_command("migrate", "migrations", "zero", verbosity=0)



    @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"})

    def test_migrate_record_squashed(self):

        """

        Running migrate for a squashed migration should record as run

        if all of the replaced migrations have been run (#25231).

        """

        recorder = MigrationRecorder(connection)

        recorder.record_applied("migrations", "0001_initial")

        recorder.record_applied("migrations", "0002_second")

        out = six.StringIO()

        call_command("migrate", "migrations", verbosity=0)

        call_command("showmigrations", "migrations", stdout=out, no_color=True)

        self.assertEqual(

            'migrations\n'

            ' [x] 0001_squashed_0002 (2 squashed migrations)\n',

            out.getvalue().lower()

        )

        self.assertIn(

            ("migrations", "0001_squashed_0002"),

            recorder.applied_migrations()

        )

        # No changes were actually applied so there is nothing to rollback





class MakeMigrationsTests(MigrationTestBase):

    """