p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #26593 -- Leveraged deferrable_sql() in SchemaEditor

This commit is contained in:
Markus Holtermann 2016-05-06 02:13:32 +02:00
parent c6499d532d
commit deeffde84a
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/base/schema.py
View File

@ -58,7 +58,7 @@ class BaseDatabaseSchemaEditor(object):
sql_create_fk = ( sql_create_fk = (
"ALTER TABLE %(table)s ADD CONSTRAINT %(name)s FOREIGN KEY (%(column)s) " "ALTER TABLE %(table)s ADD CONSTRAINT %(name)s FOREIGN KEY (%(column)s) "
"REFERENCES %(to_table)s (%(to_column)s) DEFERRABLE INITIALLY DEFERRED" "REFERENCES %(to_table)s (%(to_column)s)%(deferrable)s"
) )
sql_create_inline_fk = None sql_create_inline_fk = None
sql_delete_fk = "ALTER TABLE %(table)s DROP CONSTRAINT %(name)s" sql_delete_fk = "ALTER TABLE %(table)s DROP CONSTRAINT %(name)s"
@ -889,6 +889,7 @@ class BaseDatabaseSchemaEditor(object):
"column": self.quote_name(from_column), "column": self.quote_name(from_column),
"to_table": self.quote_name(to_table), "to_table": self.quote_name(to_table),
"to_column": self.quote_name(to_column), "to_column": self.quote_name(to_column),
"deferrable": self.connection.ops.deferrable_sql(),
} }
def _create_unique_sql(self, model, columns): def _create_unique_sql(self, model, columns):

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

@ -13,10 +13,6 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
sql_delete_unique = "ALTER TABLE %(table)s DROP INDEX %(name)s" sql_delete_unique = "ALTER TABLE %(table)s DROP INDEX %(name)s"
sql_create_fk = (
"ALTER TABLE %(table)s ADD CONSTRAINT %(name)s FOREIGN KEY "
"(%(column)s) REFERENCES %(to_table)s (%(to_column)s)"
)
sql_delete_fk = "ALTER TABLE %(table)s DROP FOREIGN KEY %(name)s" sql_delete_fk = "ALTER TABLE %(table)s DROP FOREIGN KEY %(name)s"
sql_delete_index = "DROP INDEX %(name)s ON %(table)s" sql_delete_index = "DROP INDEX %(name)s ON %(table)s"

1
tests/schema/tests.py
View File

@ -1628,6 +1628,7 @@ class SchemaTests(TransactionTestCase):
"column": editor.quote_name(column), "column": editor.quote_name(column),
"to_table": editor.quote_name(table), "to_table": editor.quote_name(table),
"to_column": editor.quote_name(model._meta.auto_field.column), "to_column": editor.quote_name(model._meta.auto_field.column),
"deferrable": connection.ops.deferrable_sql(),
} }
) )
editor.alter_field(model, get_field(Author, CASCADE, field_class=ForeignKey), field) editor.alter_field(model, get_field(Author, CASCADE, field_class=ForeignKey), field)