Commit 4b3b2510 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Fix soft-apply detection of migrations with dependencies

parent 78a26177

django/db/migrations/executor.py

+3 −1
Original line number Diff line number Diff line
@@ -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