Commit 28779abb authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Fix bad conflict detection during makemigrations

parent 8d7e048a

django/core/management/commands/makemigrations.py

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class Command(BaseCommand): 
        # Load the current graph state. Takes a connection, but it's not used

        # (makemigrations doesn't look at the database state).

        # Also make sure the graph is built without unmigrated apps shoehorned in.

        loader = MigrationLoader(connections[DEFAULT_DB_ALIAS])

        loader = MigrationLoader(connections[DEFAULT_DB_ALIAS], load=False)

        loader.build_graph(ignore_unmigrated=True)



        # Before anything else, see if there's conflicting apps and drop out

django/db/migrations/loader.py

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ class MigrationLoader(object): 
                if parent[1] == "__first__" and parent not in self.graph:

                    if parent[0] in self.unmigrated_apps:

                        if ignore_unmigrated:

                            migration.dependencies.remove(parent)

                            parent = None

                        else:

                            # This app isn't migrated, but something depends on it.