diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/migrations/test_autodetector.py | 7 | ||||
| -rw-r--r-- | tests/migrations/test_commands.py | 2 | ||||
| -rw-r--r-- | tests/migrations/test_optimizer.py | 152 |
3 files changed, 157 insertions, 4 deletions
diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py index d5ddd30894..e6497314dd 100644 --- a/tests/migrations/test_autodetector.py +++ b/tests/migrations/test_autodetector.py @@ -1149,9 +1149,10 @@ class AutodetectorTests(TestCase): changes = autodetector._detect_changes() # Right number/type of migrations? self.assertNumberMigrations(changes, "otherapp", 1) - self.assertOperationTypes(changes, "otherapp", 0, ["AlterUniqueTogether", "AlterIndexTogether", "RemoveField"]) - self.assertOperationAttributes(changes, "otherapp", 0, 0, name="book", unique_together={("author", "title")}) - self.assertOperationAttributes(changes, "otherapp", 0, 1, name="book", index_together={("author", "title")}) + self.assertOperationTypes(changes, "otherapp", 0, ["RemoveField", "AlterUniqueTogether", "AlterIndexTogether"]) + self.assertOperationAttributes(changes, "otherapp", 0, 0, model_name="book", name="newfield") + self.assertOperationAttributes(changes, "otherapp", 0, 1, name="book", unique_together={("author", "title")}) + self.assertOperationAttributes(changes, "otherapp", 0, 2, name="book", index_together={("author", "title")}) def test_rename_field_and_foo_together(self): """ diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index ac4f55fa03..3077dd9e61 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -889,7 +889,7 @@ class SquashMigrationsTests(MigrationTestBase): out = six.StringIO() with self.temporary_migration_module(module="migrations.test_migrations"): call_command("squashmigrations", "migrations", "0002", interactive=False, verbosity=1, stdout=out) - self.assertIn("Optimized from 7 operations to 5 operations.", force_text(out.getvalue())) + self.assertIn("Optimized from 7 operations to 3 operations.", force_text(out.getvalue())) def test_ticket_23799_squashmigrations_no_optimize(self): """ diff --git a/tests/migrations/test_optimizer.py b/tests/migrations/test_optimizer.py index faf297b5e7..dccb783ac7 100644 --- a/tests/migrations/test_optimizer.py +++ b/tests/migrations/test_optimizer.py @@ -29,6 +29,9 @@ class OptimizerTests(SimpleTestCase): if less_than is not None and iterations >= less_than: raise self.failureException("Optimization did not take less than %s iterations (it took %s)" % (less_than, iterations)) + def assertDoesNotOptimize(self, operations): + self.assertOptimizesTo(operations, operations) + def test_single(self): """ Tests that the optimizer does nothing on a single operation, @@ -447,6 +450,155 @@ class OptimizerTests(SimpleTestCase): ], ) + def _test_create_alter_foo_field(self, alter): + """ + CreateModel, AlterFooTogether/AlterOrderWithRespectTo followed by an + add/alter/rename field should optimize to CreateModel and the Alter* + """ + # AddField + self.assertOptimizesTo( + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ]), + alter, + migrations.AddField("Foo", "c", models.IntegerField()), + ], + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ("c", models.IntegerField()), + ]), + alter, + ], + ) + + # AlterField + self.assertDoesNotOptimize( + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ]), + alter, + migrations.AlterField("Foo", "b", models.CharField(max_length=255)), + ], + ) + + self.assertOptimizesTo( + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ("c", models.IntegerField()), + ]), + alter, + migrations.AlterField("Foo", "c", models.CharField(max_length=255)), + ], + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ("c", models.CharField(max_length=255)), + ]), + alter, + ], + ) + + # RenameField + self.assertDoesNotOptimize( + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ]), + alter, + migrations.RenameField("Foo", "b", "c"), + ], + ) + + self.assertOptimizesTo( + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ]), + alter, + migrations.RenameField("Foo", "b", "x"), + migrations.RenameField("Foo", "x", "c"), + ], + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ]), + alter, + migrations.RenameField("Foo", "b", "c"), + ], + ) + + self.assertOptimizesTo( + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ("c", models.IntegerField()), + ]), + alter, + migrations.RenameField("Foo", "c", "d"), + ], + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ("d", models.IntegerField()), + ]), + alter, + ], + ) + + # RemoveField + self.assertDoesNotOptimize( + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ]), + alter, + migrations.RemoveField("Foo", "b"), + ], + ) + + self.assertOptimizesTo( + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ("c", models.IntegerField()), + ]), + alter, + migrations.RemoveField("Foo", "c"), + ], + [ + migrations.CreateModel("Foo", [ + ("a", models.IntegerField()), + ("b", models.IntegerField()), + ]), + alter, + ], + ) + + def test_create_alter_unique_field(self): + self._test_create_alter_foo_field(migrations.AlterUniqueTogether("Foo", [["a", "b"]])) + + def test_create_alter_index_field(self): + self._test_create_alter_foo_field(migrations.AlterIndexTogether("Foo", [["a", "b"]])) + + def test_create_alter_owrt_field(self): + self._test_create_alter_foo_field(migrations.AlterOrderWithRespectTo("Foo", "b")) + def test_optimize_through_fields(self): """ Checks that field-level through checking is working. |