Commit fe5f29eb authored by Tim Graham's avatar Tim Graham
Browse files

[1.7.x] Fixed #23008 -- Fixed typo causing bad migration dependencies. 

Thanks semenov for the report and Florian for investigation.

Backport of 9a2ab629 from master
parent f2011e21

django/db/migrations/autodetector.py

+2 −2
Original line number Diff line number Diff line
@@ -254,13 +254,13 @@ class MigrationAutodetector(object): 
                                    # If we can't find the other app, we add a first/last dependency,

                                    # but only if we've already been through once and checked everything

                                    if chop_mode:

                                        # If the app already exists, we add __last__, as we don't know which

                                        # If the app already exists, we add __latest__, as we don't know which

                                        # migration contains the target field.

                                        # If it's not yet migrated or has no migrations, we use __first__

                                        if graph and not graph.root_nodes(dep[0]):

                                            operation_dependencies.add((dep[0], "__first__"))

                                        else:

                                            operation_dependencies.add((dep[0], "__last__"))

                                            operation_dependencies.add((dep[0], "__latest__"))

                                    else:

                                        deps_satisfied = False

                    if deps_satisfied:

tests/migrations/test_autodetector.py

+1 −1
Original line number Diff line number Diff line
@@ -1045,4 +1045,4 @@ class AutodetectorTests(TestCase): 
        self.assertOperationTypes(changes, 'otherapp', 0, ["CreateModel"])

        self.assertOperationAttributes(changes, 'otherapp', 0, 0, name="Book")

        # Right dependencies?

        self.assertEqual(changes['otherapp'][0].dependencies, [("migrations", "__last__")])
 
        self.assertEqual(changes['otherapp'][0].dependencies, [("migrations", "__latest__")])