diff options
| author | Viktor Lomakin <vl.dart.py@gmail.com> | 2019-09-03 13:42:04 +0300 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-09-03 14:45:49 +0200 |
| commit | 5931d2e96ae94b204d146b7f751e0e804da74953 (patch) | |
| tree | 561d44fe7ec7da770a5ed4e2b5b35c4113d45d92 | |
| parent | 003bb34b218adb23d1a7e67932a6ba9b3c4dcc81 (diff) | |
Fixed #30691 -- Made migrations autodetector find dependencies for foreign keys altering.
| -rw-r--r-- | django/db/migrations/autodetector.py | 5 | ||||
| -rw-r--r-- | tests/migrations/test_autodetector.py | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py index 0dc1c77c53..1c40161c7f 100644 --- a/django/db/migrations/autodetector.py +++ b/django/db/migrations/autodetector.py @@ -912,6 +912,7 @@ class MigrationAutodetector: old_field_name = self.renamed_fields.get((app_label, model_name, field_name), field_name) old_field = self.old_apps.get_model(app_label, old_model_name)._meta.get_field(old_field_name) new_field = self.new_apps.get_model(app_label, model_name)._meta.get_field(field_name) + dependencies = [] # Implement any model renames on relations; these are handled by RenameModel # so we need to exclude them from the comparison if hasattr(new_field, "remote_field") and getattr(new_field.remote_field, "model", None): @@ -939,6 +940,7 @@ class MigrationAutodetector: self.renamed_fields.get(rename_key + (to_field,), to_field) for to_field in new_field.to_fields ]) + dependencies.extend(self._get_dependencies_for_foreign_key(new_field)) if hasattr(new_field, "remote_field") and getattr(new_field.remote_field, "through", None): rename_key = ( new_field.remote_field.through._meta.app_label, @@ -970,7 +972,8 @@ class MigrationAutodetector: name=field_name, field=field, preserve_default=preserve_default, - ) + ), + dependencies=dependencies, ) else: # We cannot alter between m2m and concrete fields diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py index e9926ba3bf..1d5b8ef463 100644 --- a/tests/migrations/test_autodetector.py +++ b/tests/migrations/test_autodetector.py @@ -352,6 +352,11 @@ class AutodetectorTests(TestCase): ("author", models.ForeignKey("migrations.UnmigratedModel", models.CASCADE)), ("title", models.CharField(max_length=200)), ]) + book_with_no_author_fk = ModelState("otherapp", "Book", [ + ("id", models.AutoField(primary_key=True)), + ("author", models.IntegerField()), + ("title", models.CharField(max_length=200)), + ]) book_with_no_author = ModelState("otherapp", "Book", [ ("id", models.AutoField(primary_key=True)), ("title", models.CharField(max_length=200)), @@ -2251,6 +2256,15 @@ class AutodetectorTests(TestCase): self.assertOperationAttributes(changes, 'testapp', 0, 0, name="book") self.assertMigrationDependencies(changes, 'testapp', 0, [("otherapp", "__first__")]) + def test_alter_field_to_fk_dependency_other_app(self): + changes = self.get_changes( + [self.author_empty, self.book_with_no_author_fk], + [self.author_empty, self.book], + ) + self.assertNumberMigrations(changes, 'otherapp', 1) + self.assertOperationTypes(changes, 'otherapp', 0, ['AlterField']) + self.assertMigrationDependencies(changes, 'otherapp', 0, [('testapp', '__first__')]) + def test_circular_dependency_mixed_addcreate(self): """ #23315 - The dependency resolver knows to put all CreateModel |