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

4 files changed, 44 insertions, 0 deletions

diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py
new file mode 100644
index 0000000000..dcd67ca101
--- /dev/null
+++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py
@@ -0,0 +1,13 @@
+# -*- 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)
+    ]
diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py
new file mode 100644
index 0000000000..fcd43bd0c6
--- /dev/null
+++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    replaces = [
+        ("app2", "1_auto"),
+        ("app2", "2_auto"),
+    ]
+
+    dependencies = [("app1", "1_auto")]
+
+    operations = [
+        migrations.RunPython(lambda apps, schema_editor: None)
+    ]
diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py
new file mode 100644
index 0000000000..9743fc92a2
--- /dev/null
+++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("app2", "1_auto")]
+
+    operations = [
+        migrations.RunPython(lambda apps, schema_editor: None)
+    ]
diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/__init__.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/__init__.py