innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #23244: Error altering FK to non-FK in migrations

This commit is contained in:
Andrew Godwin 2014-08-07 11:52:03 +10:00
parent 938da36cb1
commit dfe86449c9
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/operations/fields.py
View File

@ -126,7 +126,7 @@ class AlterField(Operation):
if from_field.rel and from_field.rel.to: if from_field.rel and from_field.rel.to:
if isinstance(from_field.rel.to, six.string_types): if isinstance(from_field.rel.to, six.string_types):
from_field.rel.to = to_field.rel.to from_field.rel.to = to_field.rel.to
elif isinstance(to_field.rel.to, six.string_types): elif to_field.rel and isinstance(to_field.rel.to, six.string_types):
to_field.rel.to = from_field.rel.to to_field.rel.to = from_field.rel.to
schema_editor.alter_field(from_model, from_field, to_field) schema_editor.alter_field(from_model, from_field, to_field)

30
tests/migrations/test_operations.py
View File

@ -1078,6 +1078,30 @@ class OperationTests(OperationTestBase):
create_operation.database_forwards("test_alfk", editor, project_state, create_state) create_operation.database_forwards("test_alfk", editor, project_state, create_state)
alter_operation.database_forwards("test_alfk", editor, create_state, alter_state) alter_operation.database_forwards("test_alfk", editor, create_state, alter_state)
def test_alter_fk_non_fk(self):
"""
Tests that altering an FK to a non-FK works (#23244)
"""
# Test the state alteration
operation = migrations.AlterField(
model_name="Rider",
name="pony",
field=models.FloatField(),
)
project_state, new_state = self.make_test_state("test_afknfk", operation, related_model=True)
# Test the database alteration
self.assertColumnExists("test_afknfk_rider", "pony_id")
self.assertColumnNotExists("test_afknfk_rider", "pony")
with connection.schema_editor() as editor:
operation.database_forwards("test_afknfk", editor, project_state, new_state)
self.assertColumnExists("test_afknfk_rider", "pony")
self.assertColumnNotExists("test_afknfk_rider", "pony_id")
# And test reversal
with connection.schema_editor() as editor:
operation.database_backwards("test_afknfk", editor, new_state, project_state)
self.assertColumnExists("test_afknfk_rider", "pony_id")
self.assertColumnNotExists("test_afknfk_rider", "pony")
@unittest.skipIf(sqlparse is None and connection.features.requires_sqlparse_for_splitting, "Missing sqlparse") @unittest.skipIf(sqlparse is None and connection.features.requires_sqlparse_for_splitting, "Missing sqlparse")
def test_run_sql(self): def test_run_sql(self):
""" """
@ -1345,11 +1369,11 @@ class SwappableOperationTests(OperationTestBase):
) )
project_state, new_state = self.make_test_state("test_adfligsw", operation) project_state, new_state = self.make_test_state("test_adfligsw", operation)
# Test the database alteration # Test the database alteration
self.assertTableNotExists("test_adfligsw_pont") self.assertTableNotExists("test_adfligsw_pony")
with connection.schema_editor() as editor: with connection.schema_editor() as editor:
operation.database_forwards("test_adfligsw", editor, project_state, new_state) operation.database_forwards("test_adfligsw", editor, project_state, new_state)
self.assertTableNotExists("test_adfligsw_pont") self.assertTableNotExists("test_adfligsw_pony")
# And test reversal # And test reversal
with connection.schema_editor() as editor: with connection.schema_editor() as editor:
operation.database_backwards("test_adfligsw", editor, new_state, project_state) operation.database_backwards("test_adfligsw", editor, new_state, project_state)
self.assertTableNotExists("test_adfligsw_pont") self.assertTableNotExists("test_adfligsw_pony")