Commit 2009525c authored by Tim Graham's avatar Tim Graham
Browse files

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

Backport of 7c637a3a from master
parent efdcd13c

tests/schema/tests.py

+3 −2
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ class SchemaTests(TransactionTestCase): 


    def delete_tables(self):

        "Deletes all model tables for our models for a clean test environment"

        converter = connection.introspection.table_name_converter

        with connection.cursor() as cursor:

            connection.disable_constraint_checking()

            table_names = connection.introspection.table_names(cursor)
@@ -68,7 +69,7 @@ class SchemaTests(TransactionTestCase): 
                # Remove any M2M tables first

                for field in model._meta.local_many_to_many:

                    with atomic():

                        tbl = field.rel.through._meta.db_table

                        tbl = converter(field.rel.through._meta.db_table)

                        if tbl in table_names:

                            cursor.execute(connection.schema_editor().sql_delete_table % {

                                "table": connection.ops.quote_name(tbl),
@@ -76,7 +77,7 @@ class SchemaTests(TransactionTestCase): 
                            table_names.remove(tbl)

                # Then remove the main tables

                with atomic():

                    tbl = model._meta.db_table

                    tbl = converter(model._meta.db_table)

                    if tbl in table_names:

                        cursor.execute(connection.schema_editor().sql_delete_table % {

                            "table": connection.ops.quote_name(tbl),