From 2a5aca38bbb37f6e7590ac6e68912bfbefb17dae Mon Sep 17 00:00:00 2001 From: "petr.prikryl" Date: Wed, 29 May 2024 11:22:32 +0200 Subject: Fixed #35487 -- Removed CASCADE from RemoveField() on PostgreSQL. Co-authored-by: Mariusz Felisiak Co-authored-by: Adam Johnson Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> --- django/db/backends/base/schema.py | 2 +- django/db/backends/mysql/schema.py | 3 --- django/db/backends/oracle/schema.py | 1 - django/db/backends/sqlite3/schema.py | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) (limited to 'django') diff --git a/django/db/backends/base/schema.py b/django/db/backends/base/schema.py index 91351e5c9e..cf9243ccf0 100644 --- a/django/db/backends/base/schema.py +++ b/django/db/backends/base/schema.py @@ -95,7 +95,7 @@ class BaseDatabaseSchemaEditor: sql_alter_column_default = "ALTER COLUMN %(column)s SET DEFAULT %(default)s" sql_alter_column_no_default = "ALTER COLUMN %(column)s DROP DEFAULT" sql_alter_column_no_default_null = sql_alter_column_no_default - sql_delete_column = "ALTER TABLE %(table)s DROP COLUMN %(column)s CASCADE" + sql_delete_column = "ALTER TABLE %(table)s DROP COLUMN %(column)s" sql_rename_column = ( "ALTER TABLE %(table)s RENAME COLUMN %(old_column)s TO %(new_column)s" ) diff --git a/django/db/backends/mysql/schema.py b/django/db/backends/mysql/schema.py index 002ed20700..a4dba0ad39 100644 --- a/django/db/backends/mysql/schema.py +++ b/django/db/backends/mysql/schema.py @@ -11,9 +11,6 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): sql_alter_column_type = "MODIFY %(column)s %(type)s%(collation)s%(comment)s" sql_alter_column_no_default_null = "ALTER COLUMN %(column)s SET DEFAULT NULL" - # No 'CASCADE' which works as a no-op in MySQL but is undocumented - sql_delete_column = "ALTER TABLE %(table)s DROP COLUMN %(column)s" - sql_delete_unique = "ALTER TABLE %(table)s DROP INDEX %(name)s" sql_create_column_inline_fk = ( ", ADD CONSTRAINT %(name)s FOREIGN KEY (%(column)s) " diff --git a/django/db/backends/oracle/schema.py b/django/db/backends/oracle/schema.py index ba3c4778d3..f094bfb038 100644 --- a/django/db/backends/oracle/schema.py +++ b/django/db/backends/oracle/schema.py @@ -19,7 +19,6 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): sql_alter_column_no_default = "MODIFY %(column)s DEFAULT NULL" sql_alter_column_no_default_null = sql_alter_column_no_default - sql_delete_column = "ALTER TABLE %(table)s DROP COLUMN %(column)s" sql_create_column_inline_fk = ( "CONSTRAINT %(name)s REFERENCES %(to_table)s(%(to_column)s)%(deferrable)s" ) diff --git a/django/db/backends/sqlite3/schema.py b/django/db/backends/sqlite3/schema.py index 3617d17fac..10edfd81b9 100644 --- a/django/db/backends/sqlite3/schema.py +++ b/django/db/backends/sqlite3/schema.py @@ -16,7 +16,6 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): "REFERENCES %(to_table)s (%(to_column)s) DEFERRABLE INITIALLY DEFERRED" ) sql_create_column_inline_fk = sql_create_inline_fk - sql_delete_column = "ALTER TABLE %(table)s DROP COLUMN %(column)s" sql_create_unique = "CREATE UNIQUE INDEX %(name)s ON %(table)s (%(columns)s)" sql_delete_unique = "DROP INDEX %(name)s" sql_alter_table_comment = None -- cgit v1.3