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

[1.8.x] Applied db_table conversion to fix schema tests on Oracle. 

Backport of 7c637a3aae from master
This commit is contained in:
Tim Graham 2015-06-02 19:17:17 -04:00
parent efdcd13c34
commit 2009525c8b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/schema/tests.py
View File

@ -61,6 +61,7 @@ class SchemaTests(TransactionTestCase):
def delete_tables(self): def delete_tables(self):
"Deletes all model tables for our models for a clean test environment" "Deletes all model tables for our models for a clean test environment"
converter = connection.introspection.table_name_converter
with connection.cursor() as cursor: with connection.cursor() as cursor:
connection.disable_constraint_checking() connection.disable_constraint_checking()
table_names = connection.introspection.table_names(cursor) table_names = connection.introspection.table_names(cursor)
@ -68,7 +69,7 @@ class SchemaTests(TransactionTestCase):
# Remove any M2M tables first # Remove any M2M tables first
for field in model._meta.local_many_to_many: for field in model._meta.local_many_to_many:
with atomic(): with atomic():
tbl = field.rel.through._meta.db_table tbl = converter(field.rel.through._meta.db_table)
if tbl in table_names: if tbl in table_names:
cursor.execute(connection.schema_editor().sql_delete_table % { cursor.execute(connection.schema_editor().sql_delete_table % {
"table": connection.ops.quote_name(tbl), "table": connection.ops.quote_name(tbl),
@ -76,7 +77,7 @@ class SchemaTests(TransactionTestCase):
table_names.remove(tbl) table_names.remove(tbl)
# Then remove the main tables # Then remove the main tables
with atomic(): with atomic():
tbl = model._meta.db_table tbl = converter(model._meta.db_table)
if tbl in table_names: if tbl in table_names:
cursor.execute(connection.schema_editor().sql_delete_table % { cursor.execute(connection.schema_editor().sql_delete_table % {
"table": connection.ops.quote_name(tbl), "table": connection.ops.quote_name(tbl),