浏览代码

Fix soft-apply detection of migrations with dependencies

Andrew Godwin 11 年之前
父节点
当前提交
4b3b25104d
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      django/db/migrations/executor.py

+ 3 - 1
django/db/migrations/executor.py

@@ -85,7 +85,7 @@ class MigrationExecutor(object):
             self.progress_callback("apply_start", migration, fake)
         if not fake:
             # Test to see if this is an already-applied initial migration
-            if not migration.dependencies and self.detect_soft_applied(migration):
+            if self.detect_soft_applied(migration):
                 fake = True
             else:
                 # Alright, do it normally
@@ -135,4 +135,6 @@ class MigrationExecutor(object):
                 model = apps.get_model(migration.app_label, operation.name)
                 if model._meta.db_table not in self.connection.introspection.get_table_list(self.connection.cursor()):
                     return False
+            else:
+                return False
         return True