Commit fd061b65 authored by twidi's avatar twidi Committed by Tim Graham
Browse files

Fixed #23733 -- Fixed squashing migrations that depend on multiple apps.

parent cc25bfeb

django/db/migrations/loader.py

+9 −2
Original line number Diff line number Diff line
@@ -221,6 +221,13 @@ class MigrationLoader(object): 
                for child_key in reverse_dependencies.get(replaced, set()):

                    if child_key in migration.replaces:

                        continue

                    # child_key may appear in a replacement

                    if child_key in reverse_replacements:

                        for replaced_child_key in reverse_replacements[child_key]:

                            if replaced in replacing[replaced_child_key].dependencies:

                                replacing[replaced_child_key].dependencies.remove(replaced)

                                replacing[replaced_child_key].dependencies.append(key)

                    else:

                        normal[child_key].dependencies.remove(replaced)

                        normal[child_key].dependencies.append(key)

            normal[key] = migration

tests/migrations/test_loader.py

+21 −0
Original line number Diff line number Diff line
@@ -239,6 +239,27 @@ class LoaderTests(TestCase): 


        recorder.flush()



    @override_settings(MIGRATION_MODULES={

        "app1": "migrations.test_migrations_squashed_complex_multi_apps.app1",

        "app2": "migrations.test_migrations_squashed_complex_multi_apps.app2",

    })

    @modify_settings(INSTALLED_APPS={'append': [

        "migrations.test_migrations_squashed_complex_multi_apps.app1",

        "migrations.test_migrations_squashed_complex_multi_apps.app2",

    ]})

    def test_loading_squashed_complex_multi_apps(self):

        loader = MigrationLoader(connection)

        loader.build_graph()



        plan = set(loader.graph.forwards_plan(('app1', '4_auto')))

        expected_plan = set([

            ('app1', '4_auto'),

            ('app1', '2_squashed_3'),

            ('app2', '1_squashed_2'),

            ('app1', '1_auto')

        ])

        self.assertEqual(plan, expected_plan)



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

    def test_loading_squashed_erroneous(self):

        "Tests loading a complex but erroneous set of squashed migrations"

tests/migrations/test_migrations_squashed_complex_multi_apps/__init__.py

0 → 100644
+0 −0

Empty file added.

tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

from __future__ import unicode_literals



from django.db import migrations





class Migration(migrations.Migration):



    operations = [

        migrations.RunPython(lambda apps, schema_editor: None)

    ]

tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

from __future__ import unicode_literals



from django.db import migrations





class Migration(migrations.Migration):



    dependencies = [("app1", "1_auto")]



    operations = [

        migrations.RunPython(lambda apps, schema_editor: None)

    ]