diff options
| -rw-r--r-- | django/db/backends/base/schema.py | 6 | ||||
| -rw-r--r-- | tests/schema/tests.py | 47 |
2 files changed, 36 insertions, 17 deletions
diff --git a/django/db/backends/base/schema.py b/django/db/backends/base/schema.py index fc2120899d..44e598f92e 100644 --- a/django/db/backends/base/schema.py +++ b/django/db/backends/base/schema.py @@ -941,7 +941,11 @@ class BaseDatabaseSchemaEditor(object): """ Returns all constraint names matching the columns and conditions """ - column_names = list(column_names) if column_names else None + if column_names is not None: + column_names = [ + self.connection.introspection.column_name_converter(name) + for name in column_names + ] with self.connection.cursor() as cursor: constraints = self.connection.introspection.get_constraints(cursor, model._meta.db_table) result = [] diff --git a/tests/schema/tests.py b/tests/schema/tests.py index 938e83c43d..789b8b9ff2 100644 --- a/tests/schema/tests.py +++ b/tests/schema/tests.py @@ -1622,7 +1622,6 @@ class SchemaTests(TransactionTestCase): with self.assertRaises(DatabaseError): list(Thing.objects.all()) - @skipUnlessDBFeature('supports_foreign_keys') def test_remove_constraints_capital_letters(self): """ #23065 - Constraint names must be quoted if they contain capital letters. @@ -1642,36 +1641,52 @@ class SchemaTests(TransactionTestCase): editor.create_model(model) editor.add_field(model, field) + constraint_name = "CamelCaseIndex" editor.execute( editor.sql_create_index % { "table": editor.quote_name(table), - "name": editor.quote_name("CamelCaseIndex"), + "name": editor.quote_name(constraint_name), "columns": editor.quote_name(column), "extra": "", } ) - editor.alter_field(model, get_field(db_index=True), field) + if connection.features.uppercases_column_names: + constraint_name = constraint_name.upper() + self.assertIn(constraint_name, self.get_constraints(model._meta.db_table)) + editor.alter_field(model, get_field(db_index=True), field, strict=True) + self.assertNotIn(constraint_name, self.get_constraints(model._meta.db_table)) + constraint_name = "CamelCaseUniqConstraint" editor.execute( editor.sql_create_unique % { "table": editor.quote_name(table), - "name": editor.quote_name("CamelCaseUniqConstraint"), + "name": editor.quote_name(constraint_name), "columns": editor.quote_name(field.column), } ) - editor.alter_field(model, get_field(unique=True), field) + if connection.features.uppercases_column_names: + constraint_name = constraint_name.upper() + self.assertIn(constraint_name, self.get_constraints(model._meta.db_table)) + editor.alter_field(model, get_field(unique=True), field, strict=True) + self.assertNotIn(constraint_name, self.get_constraints(model._meta.db_table)) - editor.execute( - editor.sql_create_fk % { - "table": editor.quote_name(table), - "name": editor.quote_name("CamelCaseFKConstraint"), - "column": editor.quote_name(column), - "to_table": editor.quote_name(table), - "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) + if connection.features.supports_foreign_keys: + constraint_name = "CamelCaseFKConstraint" + editor.execute( + editor.sql_create_fk % { + "table": editor.quote_name(table), + "name": editor.quote_name(constraint_name), + "column": editor.quote_name(column), + "to_table": editor.quote_name(table), + "to_column": editor.quote_name(model._meta.auto_field.column), + "deferrable": connection.ops.deferrable_sql(), + } + ) + if connection.features.uppercases_column_names: + constraint_name = constraint_name.upper() + self.assertIn(constraint_name, self.get_constraints(model._meta.db_table)) + editor.alter_field(model, get_field(Author, CASCADE, field_class=ForeignKey), field, strict=True) + self.assertNotIn(constraint_name, self.get_constraints(model._meta.db_table)) def test_add_field_use_effective_default(self): """ |