Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions django/db/migrations/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,7 @@ def check_replacements(self):
"""
applied = self.recorder.applied_migrations()
for key, migration in self.loader.replacements.items():
all_applied = all(m in applied for m in migration.replaces)
if all_applied and key not in applied:
if key not in applied and self.loader.all_replaced_applied(key, applied):
self.recorder.record_applied(*key)

def detect_soft_applied(self, project_state, migration):
Expand Down
21 changes: 16 additions & 5 deletions django/db/migrations/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,8 @@ def check_consistent_history(self, connection):
if parent not in applied:
# Skip unapplied squashed migrations that have all of their
# `replaces` applied.
if parent in self.replacements:
if all(
m in applied for m in self.replacements[parent].replaces
):
continue
if self.all_replaced_applied(parent.key, applied):
continue
raise InconsistentMigrationHistory(
"Migration {}.{} is applied before its dependency "
"{}.{} on database '{}'.".format(
Expand All @@ -368,6 +365,20 @@ def check_consistent_history(self, connection):
)
)

def all_replaced_applied(self, migration_key, applied):
"""
Checks (recursively) whether all replaced migrations are applied.
"""
if migration_key in self.replacements:
for replaced_key in self.replacements[migration_key].replaces:
if replaced_key not in applied and not self.all_replaced_applied(
replaced_key, applied
):
return False
return True

return False

def detect_conflicts(self):
"""
Look through the loaded graph and detect any conflicts - apps
Expand Down
Loading