test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3563 from MarkusH/ticket23859 

Fixed #23859 -- Fixed a migration crash when a field is renamed that is part of an index_together
This commit is contained in:
Carl Meyer 2014-11-17 19:52:50 +01:00
parent 19ae13d9ed 7b4a994599
commit 6ae1e3ba9f
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,13 +177,14 @@ class RenameField(Operation):
(self.new_name if n == self.old_name else n, f) (self.new_name if n == self.old_name else n, f)
for n, f in state.models[app_label, self.model_name.lower()].fields for n, f in state.models[app_label, self.model_name.lower()].fields
] ]
# Fix unique_together to refer to the new field # Fix index/unique_together to refer to the new field
options = state.models[app_label, self.model_name.lower()].options options = state.models[app_label, self.model_name.lower()].options
if "unique_together" in options: for option in ('index_together', 'unique_together'):
options['unique_together'] = [ if option in options:
[self.new_name if n == self.old_name else n for n in unique] options[option] = [
for unique in options['unique_together'] [self.new_name if n == self.old_name else n for n in together]
] for together in options[option]
]
def database_forwards(self, app_label, schema_editor, from_state, to_state): def database_forwards(self, app_label, schema_editor, from_state, to_state):
to_model = to_state.render().get_model(app_label, self.model_name) to_model = to_state.render().get_model(app_label, self.model_name)

3
docs/releases/1.7.2.txt
View File

@ -59,3 +59,6 @@ Bugfixes
* Fixed a custom field type validation error with MySQL backend when * Fixed a custom field type validation error with MySQL backend when
``db_type`` returned ``None`` (:ticket:`23761`). ``db_type`` returned ``None`` (:ticket:`23761`).
* Fixed a migration crash when a field is renamed that is part of an
``index_together`` (:ticket:`23859`).

8
tests/migrations/test_operations.py
View File

@ -49,7 +49,7 @@ class OperationTestBase(MigrationTestBase):
def set_up_test_model(self, app_label, second_model=False, third_model=False, def set_up_test_model(self, app_label, second_model=False, third_model=False,
related_model=False, mti_model=False, proxy_model=False, related_model=False, mti_model=False, proxy_model=False,
unique_together=False, options=False, db_table=None): unique_together=False, options=False, db_table=None, index_together=False):
""" """
Creates a test model state and database table. Creates a test model state and database table.
""" """
@ -81,6 +81,7 @@ class OperationTestBase(MigrationTestBase):
# Make the "current" state # Make the "current" state
model_options = { model_options = {
"swappable": "TEST_SWAP_MODEL", "swappable": "TEST_SWAP_MODEL",
"index_together": [["pink", "weight"]] if index_together else [],
"unique_together": [["pink", "weight"]] if unique_together else [], "unique_together": [["pink", "weight"]] if unique_together else [],
} }
if options: if options:
@ -984,7 +985,7 @@ class OperationTests(OperationTestBase):
""" """
Tests the RenameField operation. Tests the RenameField operation.
""" """
project_state = self.set_up_test_model("test_rnfl", unique_together=True) project_state = self.set_up_test_model("test_rnfl", unique_together=True, index_together=True)
# Test the state alteration # Test the state alteration
operation = migrations.RenameField("Pony", "pink", "blue") operation = migrations.RenameField("Pony", "pink", "blue")
self.assertEqual(operation.describe(), "Rename field pink on Pony to blue") self.assertEqual(operation.describe(), "Rename field pink on Pony to blue")
@ -995,6 +996,9 @@ class OperationTests(OperationTestBase):
# Make sure the unique_together has the renamed column too # Make sure the unique_together has the renamed column too
self.assertIn("blue", new_state.models["test_rnfl", "pony"].options['unique_together'][0]) self.assertIn("blue", new_state.models["test_rnfl", "pony"].options['unique_together'][0])
self.assertNotIn("pink", new_state.models["test_rnfl", "pony"].options['unique_together'][0]) self.assertNotIn("pink", new_state.models["test_rnfl", "pony"].options['unique_together'][0])
# Make sure the index_together has the renamed column too
self.assertIn("blue", new_state.models["test_rnfl", "pony"].options['index_together'][0])
self.assertNotIn("pink", new_state.models["test_rnfl", "pony"].options['index_together'][0])
# Test the database alteration # Test the database alteration
self.assertColumnExists("test_rnfl_pony", "pink") self.assertColumnExists("test_rnfl_pony", "pink")
self.assertColumnNotExists("test_rnfl_pony", "blue") self.assertColumnNotExists("test_rnfl_pony", "blue")