mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #23091: CreateModel and AddField were clashing with deferred SQL

Browse Source
This commit is contained in:
Andrew Godwin
2014-08-04 11:58:44 +10:00
parent 1b00738f73
commit c06e124b5e
3 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/backends/schema.py
View File

@@ -546,6 +546,7 @@ class BaseDatabaseSchemaEditor(object):
}
)
# Drop any FK constraints, we'll remake them later
fks_dropped = set()
if old_field.rel:
fk_names = self._constraint_names(model, [old_field.column], foreign_key=True)
if strict and len(fk_names) != 1:
@@ -555,6 +556,7 @@ class BaseDatabaseSchemaEditor(object):
old_field.column,
))
for fk_name in fk_names:
fks_dropped.add((old_field.column,))
self.execute(
self.sql_delete_fk % {
"table": self.quote_name(model._meta.db_table),
@@ -737,7 +739,7 @@ class BaseDatabaseSchemaEditor(object):
}
)
# Does it have a foreign key?
if new_field.rel:
if new_field.rel and fks_dropped:
to_table = new_field.rel.to._meta.db_table
to_column = new_field.rel.get_related_field().column
self.execute(