From dfe86449c9951824dfa95d44af36ef1d8e578bdc Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Thu, 7 Aug 2014 11:52:03 +1000 Subject: [PATCH] Fixed #23244: Error altering FK to non-FK in migrations --- django/db/migrations/operations/fields.py | 2 +- tests/migrations/test_operations.py | 30 ++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/django/db/migrations/operations/fields.py b/django/db/migrations/operations/fields.py index d1e98bde3f..55f27c1b6e 100644 --- a/django/db/migrations/operations/fields.py +++ b/django/db/migrations/operations/fields.py @@ -126,7 +126,7 @@ class AlterField(Operation): if from_field.rel and from_field.rel.to: if isinstance(from_field.rel.to, six.string_types): 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 schema_editor.alter_field(from_model, from_field, to_field) diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py index 9e54f81033..fb59cf63bc 100644 --- a/tests/migrations/test_operations.py +++ b/tests/migrations/test_operations.py @@ -1078,6 +1078,30 @@ class OperationTests(OperationTestBase): create_operation.database_forwards("test_alfk", editor, project_state, create_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") def test_run_sql(self): """ @@ -1345,11 +1369,11 @@ class SwappableOperationTests(OperationTestBase): ) project_state, new_state = self.make_test_state("test_adfligsw", operation) # Test the database alteration - self.assertTableNotExists("test_adfligsw_pont") + self.assertTableNotExists("test_adfligsw_pony") with connection.schema_editor() as editor: operation.database_forwards("test_adfligsw", editor, project_state, new_state) - self.assertTableNotExists("test_adfligsw_pont") + self.assertTableNotExists("test_adfligsw_pony") # And test reversal with connection.schema_editor() as editor: operation.database_backwards("test_adfligsw", editor, new_state, project_state) - self.assertTableNotExists("test_adfligsw_pont") + self.assertTableNotExists("test_adfligsw_pony")