Commit 31fc34e4 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

[1.7.x] Rewrote migration autodetector to involve actual computer science. 

Fixes #22605, #22735; also lays the ground for some other fixes.

Conflicts:
	django/db/migrations/autodetector.py
parent c9aedce0

django/db/migrations/autodetector.py

+475 −257

File changed.

Preview size limit exceeded, changes collapsed.

django/db/migrations/optimizer.py

+26 −17
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class MigrationOptimizer(object): 
        for i, operation in enumerate(operations):

            # Compare it to each operation after it

            for j, other in enumerate(operations[i + 1:]):

                result = self.reduce(operation, other)

                result = self.reduce(operation, other, operations[i+1:i+j+1])

                if result is not None:

                    # Optimize! Add result, then remaining others, then return

                    new_operations.extend(result)
@@ -67,7 +67,7 @@ class MigrationOptimizer(object): 


    #### REDUCTION ####



    def reduce(self, operation, other):

    def reduce(self, operation, other, in_between=None):

        """

        Either returns a list of zero, one or two operations,

        or None, meaning this pair cannot be optimized.
@@ -156,24 +156,24 @@ class MigrationOptimizer(object): 
        ]

        for ia, ib, om in submethods:

            if isinstance(operation, ia) and isinstance(other, ib):

                return om(operation, other)

                return om(operation, other, in_between or [])

        return None



    def reduce_model_create_delete(self, operation, other):

    def reduce_model_create_delete(self, operation, other, in_between):

        """

        Folds a CreateModel and a DeleteModel into nothing.

        """

        if operation.name.lower() == other.name.lower():

            return []



    def reduce_model_alter_delete(self, operation, other):

    def reduce_model_alter_delete(self, operation, other, in_between):

        """

        Folds an AlterModelSomething and a DeleteModel into just delete.

        """

        if operation.name.lower() == other.name.lower():

            return [other]



    def reduce_model_create_rename(self, operation, other):

    def reduce_model_create_rename(self, operation, other, in_between):

        """

        Folds a model rename into its create

        """
@@ -187,7 +187,7 @@ class MigrationOptimizer(object): 
                )

            ]



    def reduce_model_rename_self(self, operation, other):

    def reduce_model_rename_self(self, operation, other, in_between):

        """

        Folds a model rename into another one

        """
@@ -199,8 +199,17 @@ class MigrationOptimizer(object): 
                )

            ]



    def reduce_create_model_add_field(self, operation, other):

    def reduce_create_model_add_field(self, operation, other, in_between):

        if operation.name.lower() == other.model_name.lower():

            # Don't allow optimisations of FKs through models they reference

            if hasattr(other.field, "rel") and other.field.rel:

                for between in in_between:

                    if between.references_model(

                        other.field.rel.to._meta.object_name,

                        other.field.rel.to._meta.app_label,

                    ):

                        return None

            # OK, that's fine

            return [

                migrations.CreateModel(

                    operation.name,
@@ -210,7 +219,7 @@ class MigrationOptimizer(object): 
                )

            ]



    def reduce_create_model_alter_field(self, operation, other):

    def reduce_create_model_alter_field(self, operation, other, in_between):

        if operation.name.lower() == other.model_name.lower():

            return [

                migrations.CreateModel(
@@ -224,7 +233,7 @@ class MigrationOptimizer(object): 
                )

            ]



    def reduce_create_model_rename_field(self, operation, other):

    def reduce_create_model_rename_field(self, operation, other, in_between):

        if operation.name.lower() == other.model_name.lower():

            return [

                migrations.CreateModel(
@@ -238,7 +247,7 @@ class MigrationOptimizer(object): 
                )

            ]



    def reduce_create_model_remove_field(self, operation, other):

    def reduce_create_model_remove_field(self, operation, other, in_between):

        if operation.name.lower() == other.model_name.lower():

            return [

                migrations.CreateModel(
@@ -253,7 +262,7 @@ class MigrationOptimizer(object): 
                )

            ]



    def reduce_add_field_alter_field(self, operation, other):

    def reduce_add_field_alter_field(self, operation, other, in_between):

        if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.name.lower():

            return [

                migrations.AddField(
@@ -263,15 +272,15 @@ class MigrationOptimizer(object): 
                )

            ]



    def reduce_add_field_delete_field(self, operation, other):

    def reduce_add_field_delete_field(self, operation, other, in_between):

        if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.name.lower():

            return []



    def reduce_alter_field_delete_field(self, operation, other):

    def reduce_alter_field_delete_field(self, operation, other, in_between):

        if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.name.lower():

            return [other]



    def reduce_add_field_rename_field(self, operation, other):

    def reduce_add_field_rename_field(self, operation, other, in_between):

        if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.old_name.lower():

            return [

                migrations.AddField(
@@ -281,7 +290,7 @@ class MigrationOptimizer(object): 
                )

            ]



    def reduce_alter_field_rename_field(self, operation, other):

    def reduce_alter_field_rename_field(self, operation, other, in_between):

        if operation.model_name.lower() == other.model_name.lower() and operation.name.lower() == other.old_name.lower():

            return [

                other,
@@ -292,7 +301,7 @@ class MigrationOptimizer(object): 
                ),

            ]



    def reduce_rename_field_self(self, operation, other):

    def reduce_rename_field_self(self, operation, other, in_between):

        if operation.model_name.lower() == other.model_name.lower() and operation.new_name.lower() == other.old_name.lower():

            return [

                migrations.RenameField(

tests/migrations/test_autodetector.py

+129 −22
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ class AutodetectorTests(TestCase): 
        ("id", models.AutoField(primary_key=True)),

        ("publishers", models.ManyToManyField("testapp.Publisher")),

    ])

    author_with_m2m_through = ModelState("testapp", "Author", [("id", models.AutoField(primary_key=True)), ("publishers", models.ManyToManyField("testapp.Publisher", through="testapp.Contract"))])

    contract = ModelState("testapp", "Contract", [("id", models.AutoField(primary_key=True)), ("author", models.ForeignKey("testapp.Author")), ("publisher", models.ForeignKey("testapp.Publisher"))])

    publisher = ModelState("testapp", "Publisher", [("id", models.AutoField(primary_key=True)), ("name", models.CharField(max_length=100))])

    publisher_with_author = ModelState("testapp", "Publisher", [("id", models.AutoField(primary_key=True)), ("author", models.ForeignKey("testapp.Author")), ("name", models.CharField(max_length=100))])

    publisher_with_book = ModelState("testapp", "Publisher", [("id", models.AutoField(primary_key=True)), ("author", models.ForeignKey("otherapp.Book")), ("name", models.CharField(max_length=100))])
@@ -62,6 +64,67 @@ class AutodetectorTests(TestCase): 
    knight = ModelState("eggs", "Knight", [("id", models.AutoField(primary_key=True))])

    rabbit = ModelState("eggs", "Rabbit", [("id", models.AutoField(primary_key=True)), ("knight", models.ForeignKey("eggs.Knight")), ("parent", models.ForeignKey("eggs.Rabbit"))], {"unique_together": [("parent", "knight")]})



    def repr_changes(self, changes):

        output = ""

        for app_label, migrations in sorted(changes.items()):

            output += "  %s:\n" % app_label

            for migration in migrations:

                output += "    %s\n" % migration.name

                for operation in migration.operations:

                    output += "      %s\n" % operation

        return output



    def assertNumberMigrations(self, changes, app_label, number):

        if not changes.get(app_label, None):

            self.fail("No migrations found for %s\n%s" % (app_label, self.repr_changes(changes)))

        if len(changes[app_label]) != number:

            self.fail("Incorrect number of migrations (%s) for %s (expected %s)\n%s" % (

                len(changes[app_label]),

                app_label,

                number,

                self.repr_changes(changes),

            ))



    def assertOperationTypes(self, changes, app_label, index, types):

        if not changes.get(app_label, None):

            self.fail("No migrations found for %s\n%s" % (app_label, self.repr_changes(changes)))

        if len(changes[app_label]) < index + 1:

            self.fail("No migration at index %s for %s\n%s" % (index, app_label, self.repr_changes(changes)))

        migration = changes[app_label][index]

        real_types = [operation.__class__.__name__ for operation in migration.operations]

        if types != real_types:

            self.fail("Operation type mismatch for %s.%s (expected %s):\n%s" % (

                app_label,

                migration.name,

                types,

                self.repr_changes(changes),

            ))



    def assertOperationAttributes(self, changes, app_label, index, operation_index, **attrs):

        if not changes.get(app_label, None):

            self.fail("No migrations found for %s\n%s" % (app_label, self.repr_changes(changes)))

        if len(changes[app_label]) < index + 1:

            self.fail("No migration at index %s for %s\n%s" % (index, app_label, self.repr_changes(changes)))

        migration = changes[app_label][index]

        if len(changes[app_label]) < index + 1:

            self.fail("No operation at index %s for %s.%s\n%s" % (

                operation_index,

                app_label,

                migration.name,

                self.repr_changes(changes),

            ))

        operation = migration.operations[operation_index]

        for attr, value in attrs.items():

            if getattr(operation, attr, None) != value:

                self.fail("Attribute mismatch for %s.%s op #%s, %s (expected %r):\n%s" % (

                    app_label,

                    migration.name,

                    operation_index + 1,

                    attr,

                    value,

                    self.repr_changes(changes),

                ))



    def make_project_state(self, model_states):

        "Shortcut to make ProjectStates from lists of predefined models"

        project_state = ProjectState()
@@ -281,6 +344,9 @@ class AutodetectorTests(TestCase): 
    def test_fk_dependency(self):

        "Tests that having a ForeignKey automatically adds a dependency"

        # Make state

        # Note that testapp (author) has no dependencies,

        # otherapp (book) depends on testapp (author),

        # thirdapp (edition) depends on otherapp (book)

        before = self.make_project_state([])

        after = self.make_project_state([self.author_name, self.book, self.edition])

        autodetector = MigrationAutodetector(before, after)
@@ -322,12 +388,15 @@ class AutodetectorTests(TestCase): 
        self.assertEqual(len(changes['testapp']), 1)

        # Right number of actions?

        migration = changes['testapp'][0]

        self.assertEqual(len(migration.operations), 2)

        self.assertEqual(len(migration.operations), 3)

        # Right actions?

        action = migration.operations[0]

        self.assertEqual(action.__class__.__name__, "CreateModel")

        action = migration.operations[1]

        self.assertEqual(action.__class__.__name__, "CreateModel")

        # Third action might vanish one day if the optimizer improves.

        action = migration.operations[2]

        self.assertEqual(action.__class__.__name__, "AddField")

        # Right dependencies?

        self.assertEqual(migration.dependencies, [])
@@ -350,10 +419,12 @@ class AutodetectorTests(TestCase): 
        migration2 = changes['otherapp'][0]

        self.assertEqual(len(migration2.operations), 1)

        migration3 = changes['otherapp'][1]

        self.assertEqual(len(migration2.operations), 1)

        self.assertEqual(len(migration3.operations), 1)

        # Right actions?

        action = migration1.operations[0]

        self.assertEqual(action.__class__.__name__, "CreateModel")

        self.assertEqual(action.name, "Author")

        self.assertEqual(len(action.fields), 3)

        action = migration2.operations[0]

        self.assertEqual(action.__class__.__name__, "CreateModel")

        self.assertEqual(len(action.fields), 2)
@@ -362,8 +433,8 @@ class AutodetectorTests(TestCase): 
        self.assertEqual(action.name, "author")

        # Right dependencies?

        self.assertEqual(migration1.dependencies, [("otherapp", "auto_1")])

        self.assertEqual(migration2.dependencies, [('testapp', '__first__')])

        self.assertEqual(set(migration3.dependencies), set([("otherapp", "auto_1"), ("testapp", "auto_1")]))

        self.assertEqual(migration2.dependencies, [])

        self.assertEqual(set(migration3.dependencies), set([("testapp", "auto_1"), ("otherapp", "auto_1")]))



    def test_same_app_circular_fk_dependency(self):

        """
@@ -376,23 +447,23 @@ class AutodetectorTests(TestCase): 
        autodetector = MigrationAutodetector(before, after)

        changes = autodetector._detect_changes()

        # Right number of migrations?

        self.assertEqual(len(changes['testapp']), 2)

        self.assertEqual(len(changes['testapp']), 1)

        # Right number of actions?

        migration1 = changes['testapp'][0]

        self.assertEqual(len(migration1.operations), 2)

        migration2 = changes['testapp'][1]

        self.assertEqual(len(migration2.operations), 1)

        self.assertEqual(len(migration1.operations), 4)

        # Right actions?

        action = migration1.operations[0]

        self.assertEqual(action.__class__.__name__, "CreateModel")

        action = migration1.operations[1]

        self.assertEqual(action.__class__.__name__, "CreateModel")

        action = migration2.operations[0]

        action = migration1.operations[2]

        self.assertEqual(action.__class__.__name__, "AddField")

        self.assertEqual(action.name, "publisher")

        action = migration1.operations[3]

        self.assertEqual(action.__class__.__name__, "AddField")

        self.assertEqual(action.name, "author")

        # Right dependencies?

        self.assertEqual(migration1.dependencies, [])

        self.assertEqual(migration2.dependencies, [("testapp", "auto_1")])



    def test_same_app_circular_fk_dependency_and_unique_together(self):

        """
@@ -406,29 +477,22 @@ class AutodetectorTests(TestCase): 
        autodetector = MigrationAutodetector(before, after)

        changes = autodetector._detect_changes()

        # Right number of migrations?

        self.assertEqual(len(changes['eggs']), 2)

        self.assertEqual(len(changes['eggs']), 1)

        # Right number of actions?

        migration1 = changes['eggs'][0]

        self.assertEqual(len(migration1.operations), 2)

        migration2 = changes['eggs'][1]

        self.assertEqual(len(migration2.operations), 2)

        self.assertEqual(len(migration1.operations), 3)

        # Right actions?

        action = migration1.operations[0]

        self.assertEqual(action.__class__.__name__, "CreateModel")

        action = migration1.operations[1]

        self.assertEqual(action.__class__.__name__, "CreateModel")

        # CreateModel action for Rabbit should not have unique_together now

        self.assertEqual(action.name, "Rabbit")

        self.assertFalse("unique_together" in action.options)

        action = migration2.operations[0]

        self.assertEqual(action.__class__.__name__, "AddField")

        self.assertEqual(action.name, "parent")

        action = migration2.operations[1]

        action = migration1.operations[2]

        self.assertEqual(action.__class__.__name__, "AlterUniqueTogether")

        self.assertEqual(action.name, "rabbit")

        # Right dependencies?

        self.assertEqual(migration1.dependencies, [])

        self.assertEqual(migration2.dependencies, [("eggs", "auto_1")])



    def test_unique_together(self):

        "Tests unique_together detection"
@@ -658,11 +722,54 @@ class AutodetectorTests(TestCase): 
        self.assertEqual(len(changes['otherapp']), 1)

        # Right number of actions?

        migration = changes['otherapp'][0]

        self.assertEqual(len(migration.operations), 2)

        self.assertEqual(len(migration.operations), 4)

        # Right actions in right order?

        # The first two are because we can't optimise RemoveField

        # into DeleteModel reliably.

        action = migration.operations[0]

        self.assertEqual(action.__class__.__name__, "RemoveField")

        self.assertEqual(action.name, "authors")

        self.assertEqual(action.name, "author")

        action = migration.operations[1]

        self.assertEqual(action.__class__.__name__, "RemoveField")

        self.assertEqual(action.name, "book")

        action = migration.operations[2]

        self.assertEqual(action.__class__.__name__, "RemoveField")

        self.assertEqual(action.name, "authors")

        action = migration.operations[3]

        self.assertEqual(action.__class__.__name__, "DeleteModel")

        self.assertEqual(action.name, "Attribution")



    def test_m2m_w_through_multistep_remove(self):

        """

        A model with a m2m field that specifies a "through" model cannot be removed in the same

        migration as that through model as the schema will pass through an inconsistent state.

        The autodetector should produce two migrations to avoid this issue.

        """

        before = self.make_project_state([self.author_with_m2m_through, self.publisher, self.contract])

        after = self.make_project_state([self.publisher])

        autodetector = MigrationAutodetector(before, after)

        changes = autodetector._detect_changes()

        # Right number of migrations?

        self.assertNumberMigrations(changes, "testapp", 1)

        # Right actions in right order?

        self.assertOperationTypes(changes, "testapp", 0, ["RemoveField", "RemoveField", "DeleteModel", "RemoveField", "DeleteModel"])

        # Actions touching the right stuff?

        self.assertOperationAttributes(changes, "testapp", 0, 0, name="publishers")

        self.assertOperationAttributes(changes, "testapp", 0, 1, name="author")

        self.assertOperationAttributes(changes, "testapp", 0, 2, name="Author")

        self.assertOperationAttributes(changes, "testapp", 0, 3, name="publisher")

        self.assertOperationAttributes(changes, "testapp", 0, 4, name="Contract")



    def test_non_circular_foreignkey_dependency_removal(self):

        """

        If two models with a ForeignKey from one to the other are removed at the same time,

        the autodetector should remove them in the correct order.

        """

        before = self.make_project_state([self.author_with_publisher, self.publisher_with_author])

        after = self.make_project_state([])

        autodetector = MigrationAutodetector(before, after)

        changes = autodetector._detect_changes()

        # Right number of migrations?

        self.assertNumberMigrations(changes, "testapp", 1)

        # Right actions in right order?

        self.assertOperationTypes(changes, "testapp", 0, ["RemoveField", "RemoveField", "DeleteModel", "DeleteModel"])