mirror of https://github.com/django/django.git
Fixed #30691 -- Made migrations autodetector find dependencies for foreign keys altering.
This commit is contained in:
parent
003bb34b21
commit
5931d2e96a
|
@ -912,6 +912,7 @@ class MigrationAutodetector:
|
||||||
old_field_name = self.renamed_fields.get((app_label, model_name, field_name), field_name)
|
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)
|
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)
|
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
|
# Implement any model renames on relations; these are handled by RenameModel
|
||||||
# so we need to exclude them from the comparison
|
# so we need to exclude them from the comparison
|
||||||
if hasattr(new_field, "remote_field") and getattr(new_field.remote_field, "model", None):
|
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)
|
self.renamed_fields.get(rename_key + (to_field,), to_field)
|
||||||
for to_field in new_field.to_fields
|
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):
|
if hasattr(new_field, "remote_field") and getattr(new_field.remote_field, "through", None):
|
||||||
rename_key = (
|
rename_key = (
|
||||||
new_field.remote_field.through._meta.app_label,
|
new_field.remote_field.through._meta.app_label,
|
||||||
|
@ -970,7 +972,8 @@ class MigrationAutodetector:
|
||||||
name=field_name,
|
name=field_name,
|
||||||
field=field,
|
field=field,
|
||||||
preserve_default=preserve_default,
|
preserve_default=preserve_default,
|
||||||
)
|
),
|
||||||
|
dependencies=dependencies,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
# We cannot alter between m2m and concrete fields
|
# We cannot alter between m2m and concrete fields
|
||||||
|
|
|
@ -352,6 +352,11 @@ class AutodetectorTests(TestCase):
|
||||||
("author", models.ForeignKey("migrations.UnmigratedModel", models.CASCADE)),
|
("author", models.ForeignKey("migrations.UnmigratedModel", models.CASCADE)),
|
||||||
("title", models.CharField(max_length=200)),
|
("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", [
|
book_with_no_author = ModelState("otherapp", "Book", [
|
||||||
("id", models.AutoField(primary_key=True)),
|
("id", models.AutoField(primary_key=True)),
|
||||||
("title", models.CharField(max_length=200)),
|
("title", models.CharField(max_length=200)),
|
||||||
|
@ -2251,6 +2256,15 @@ class AutodetectorTests(TestCase):
|
||||||
self.assertOperationAttributes(changes, 'testapp', 0, 0, name="book")
|
self.assertOperationAttributes(changes, 'testapp', 0, 0, name="book")
|
||||||
self.assertMigrationDependencies(changes, 'testapp', 0, [("otherapp", "__first__")])
|
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):
|
def test_circular_dependency_mixed_addcreate(self):
|
||||||
"""
|
"""
|
||||||
#23315 - The dependency resolver knows to put all CreateModel
|
#23315 - The dependency resolver knows to put all CreateModel
|
||||||
|
|
Loading…
Reference in New Issue