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

Fix any sqlite field migration deleting all implicit m2m tables 

Fixes #22281
This commit is contained in:
Chris Beaven 2014-03-18 16:54:35 +13:00
parent cc5804bcab
commit b47ef04ea2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/backends/sqlite3/schema.py
View File

@ -64,6 +64,9 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
for field in delete_fields: for field in delete_fields:
del body[field.name] del body[field.name]
del mapping[field.column] del mapping[field.column]
# Remove any implicit M2M tables
if isinstance(field, ManyToManyField) and field.rel.through._meta.auto_created:
return self.delete_model(field.rel.through)
# Work inside a new app registry # Work inside a new app registry
apps = Apps() apps = Apps()
# Construct a new model for the new state # Construct a new model for the new state
@ -87,8 +90,11 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
', '.join(self.quote_name(y) for x, y in field_maps), ', '.join(self.quote_name(y) for x, y in field_maps),
self.quote_name(model._meta.db_table), self.quote_name(model._meta.db_table),
)) ))
# Delete the old table # Delete the old table (not using self.delete_model to avoid deleting
self.delete_model(model) # all implicit M2M tables)
self.execute(self.sql_delete_table % {
"table": self.quote_name(model._meta.db_table),
})
# Rename the new to the old # Rename the new to the old
self.alter_db_table(model, temp_model._meta.db_table, model._meta.db_table) self.alter_db_table(model, temp_model._meta.db_table, model._meta.db_table)
# Run deferred SQL on correct table # Run deferred SQL on correct table