From 1edfa155e34dde549ef0e93414f2846dce59e5f7 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 20 Mar 2014 05:08:28 +0100 Subject: [PATCH] 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). --- django/db/backends/schema.py | 3 ++- django/db/backends/sqlite3/schema.py | 3 +++ tests/schema/tests.py | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/django/db/backends/schema.py b/django/db/backends/schema.py index ef53ac16080..d5bb08e12cb 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 8c6db9776a6..c206a020d58 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 3eb826cee42..57c344ce8d4 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(