diff options
| author | Daniel Hahler <git@thequod.de> | 2014-03-20 05:08:28 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-03-24 13:24:52 -0400 |
| commit | 1edfa155e34dde549ef0e93414f2846dce59e5f7 (patch) | |
| tree | 3f07b7527e8bf057454afb9a49dbedbbc1195afe | |
| parent | d81a9c50d84d515ddc8ee76ecc5ad5d86e210504 (diff) | |
Fixed #22293 -- Avoided renaming many-to-many tables to themselves.
Fixed this for both implementations of _alter_many_to_many, instead of
in `alter_db_table` itself (more implementations).
| -rw-r--r-- | django/db/backends/schema.py | 3 | ||||
| -rw-r--r-- | django/db/backends/sqlite3/schema.py | 3 | ||||
| -rw-r--r-- | tests/schema/tests.py | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/django/db/backends/schema.py b/django/db/backends/schema.py index ef53ac1608..d5bb08e12c 100644 --- a/django/db/backends/schema.py +++ b/django/db/backends/schema.py @@ -762,7 +762,8 @@ class BaseDatabaseSchemaEditor(object): Alters M2Ms to repoint their to= endpoints. """ # Rename the through table - self.alter_db_table(old_field.rel.through, old_field.rel.through._meta.db_table, new_field.rel.through._meta.db_table) + if old_field.rel.through._meta.db_table != new_field.rel.through._meta.db_table: + self.alter_db_table(old_field.rel.through, old_field.rel.through._meta.db_table, new_field.rel.through._meta.db_table) # Repoint the FK to the other side self.alter_field( new_field.rel.through, diff --git a/django/db/backends/sqlite3/schema.py b/django/db/backends/sqlite3/schema.py index 8c6db9776a..c206a020d5 100644 --- a/django/db/backends/sqlite3/schema.py +++ b/django/db/backends/sqlite3/schema.py @@ -161,6 +161,9 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): """ Alters M2Ms to repoint their to= endpoints. """ + if old_field.rel.through == new_field.rel.through: + return + # Make a new through table self.create_model(new_field.rel.through) # Copy the data across diff --git a/tests/schema/tests.py b/tests/schema/tests.py index 3eb826cee4..57c344ce8d 100644 --- a/tests/schema/tests.py +++ b/tests/schema/tests.py @@ -347,6 +347,15 @@ class SchemaTests(TransactionTestCase): # Ensure there is now an m2m table there columns = self.column_classes(new_field.rel.through) self.assertEqual(columns['tagm2mtest_id'][0], "IntegerField") + + # "Alter" the field. This should not rename the DB table to itself. + with connection.schema_editor() as editor: + editor.alter_field( + Author, + new_field, + new_field, + ) + # Remove the M2M table again with connection.schema_editor() as editor: editor.remove_field( |