test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix squashed migration loading ordering issue

This commit is contained in:
Andrew Godwin 2013-11-27 12:29:22 +00:00
parent 0c46ca83e8
commit db4527e3c0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/loader.py
View File

@ -171,6 +171,8 @@ class MigrationLoader(object):
# the usage pattern here is to delete things after a while. # the usage pattern here is to delete things after a while.
del normal[replaced] del normal[replaced]
for child_key in reverse_dependencies.get(replaced, set()): for child_key in reverse_dependencies.get(replaced, set()):
if child_key in migration.replaces:
continue
normal[child_key].dependencies.remove(replaced) normal[child_key].dependencies.remove(replaced)
normal[child_key].dependencies.append(key) normal[child_key].dependencies.append(key)
normal[key] = migration normal[key] = migration