p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #26833 -- Fixed SchemaEditor._constraint_names() to handle features.uppercases_column_names.

This commit is contained in:
Jon Dufresne 2016-07-07 05:09:42 -07:00 committed by Tim Graham
parent f7e907115f
commit 3410820460
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,7 +941,11 @@ class BaseDatabaseSchemaEditor(object):
""" """
Returns all constraint names matching the columns and conditions 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: with self.connection.cursor() as cursor:
constraints = self.connection.introspection.get_constraints(cursor, model._meta.db_table) constraints = self.connection.introspection.get_constraints(cursor, model._meta.db_table)
result = [] result = []

47
tests/schema/tests.py
View File

@ -1622,7 +1622,6 @@ class SchemaTests(TransactionTestCase):
with self.assertRaises(DatabaseError): with self.assertRaises(DatabaseError):
list(Thing.objects.all()) list(Thing.objects.all())
@skipUnlessDBFeature('supports_foreign_keys')
def test_remove_constraints_capital_letters(self): def test_remove_constraints_capital_letters(self):
""" """
#23065 - Constraint names must be quoted if they contain capital letters. #23065 - Constraint names must be quoted if they contain capital letters.
@ -1642,36 +1641,52 @@ class SchemaTests(TransactionTestCase):
editor.create_model(model) editor.create_model(model)
editor.add_field(model, field) editor.add_field(model, field)
constraint_name = "CamelCaseIndex"
editor.execute( editor.execute(
editor.sql_create_index % { editor.sql_create_index % {
"table": editor.quote_name(table), "table": editor.quote_name(table),
"name": editor.quote_name("CamelCaseIndex"), "name": editor.quote_name(constraint_name),
"columns": editor.quote_name(column), "columns": editor.quote_name(column),
"extra": "", "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.execute(
editor.sql_create_unique % { editor.sql_create_unique % {
"table": editor.quote_name(table), "table": editor.quote_name(table),
"name": editor.quote_name("CamelCaseUniqConstraint"), "name": editor.quote_name(constraint_name),
"columns": editor.quote_name(field.column), "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( if connection.features.supports_foreign_keys:
editor.sql_create_fk % { constraint_name = "CamelCaseFKConstraint"
"table": editor.quote_name(table), editor.execute(
"name": editor.quote_name("CamelCaseFKConstraint"), editor.sql_create_fk % {
"column": editor.quote_name(column), "table": editor.quote_name(table),
"to_table": editor.quote_name(table), "name": editor.quote_name(constraint_name),
"to_column": editor.quote_name(model._meta.auto_field.column), "column": editor.quote_name(column),
"deferrable": connection.ops.deferrable_sql(), "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.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): def test_add_field_use_effective_default(self):
""" """