From a0fb35eb726f1a04eaa1b47b8de191fafe55a0ab Mon Sep 17 00:00:00 2001
From: Jacob Walls <jacobtylerwalls@gmail.com>
Date: Sun, 30 Mar 2025 08:18:18 -0400
Subject: [PATCH] Fixed #36184 -- Allowed migrating forward to squashed
 migrations.

---
 django/db/migrations/executor.py  | 18 +++++++++---------
 tests/migrations/test_commands.py | 10 ++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/django/db/migrations/executor.py b/django/db/migrations/executor.py
index ebfe8572fe..61b2b54f6c 100644
--- a/django/db/migrations/executor.py
+++ b/django/db/migrations/executor.py
@@ -37,18 +37,18 @@ class MigrationExecutor:
                             if migration in applied:
                                 plan.append((self.loader.graph.nodes[migration], True))
                                 applied.pop(migration)
+            # If the target is missing, it's likely a replaced migration.
+            # Reload the graph without replacements.
+            elif (
+                self.loader.replace_migrations
+                and target not in self.loader.graph.node_map
+            ):
+                self.loader.replace_migrations = False
+                self.loader.build_graph()
+                return self.migration_plan(targets, clean_start=clean_start)
             # If the migration is already applied, do backwards mode,
             # otherwise do forwards mode.
             elif target in applied:
-                # If the target is missing, it's likely a replaced migration.
-                # Reload the graph without replacements.
-                if (
-                    self.loader.replace_migrations
-                    and target not in self.loader.graph.node_map
-                ):
-                    self.loader.replace_migrations = False
-                    self.loader.build_graph()
-                    return self.migration_plan(targets, clean_start=clean_start)
                 # Don't migrate backwards all the way to the target node (that
                 # may roll back dependencies in other apps that don't need to
                 # be rolled back); instead roll back through target's immediate
diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py
index 3b4da2bbb7..00f97c5f3a 100644
--- a/tests/migrations/test_commands.py
+++ b/tests/migrations/test_commands.py
@@ -1328,6 +1328,16 @@ class MigrateTests(MigrationTestBase):
                 # Unmigrate everything.
                 call_command("migrate", "migrations", "zero", verbosity=0)
 
+    @override_settings(
+        MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"}
+    )
+    def test_migrate_forward_to_squashed_migration(self):
+        try:
+            call_command("migrate", "migrations", "0001_initial", verbosity=0)
+        finally:
+            # Unmigrate everything.
+            call_command("migrate", "migrations", "zero", verbosity=0)
+
     @override_settings(
         MIGRATION_MODULES={"migrations": "migrations.test_migrations_squashed"}
     )