- test failures:

- test_schema_2 is only on PG and doesn't need a drop all, omit this for now
- py3k has exception.args[0], not message

diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py
index 331a283f01c044883a59fe22e037c8e64a9f7dcc..7a1c7fef6ae07add13b24eb82b58ce09dc9874f9 100644 (file)
--- a/lib/sqlalchemy/sql/ddl.py
+++ b/lib/sqlalchemy/sql/ddl.py
@@ -809,7 +809,7 @@ class SchemaDropper(DDLBase):
         except exc.CircularDependencyError as err2:
             util.raise_from_cause(
                 exc.CircularDependencyError(
-                    err2.message,
+                    err2.args[0],
                     err2.cycles, err2.edges,
                     msg="Can't sort tables for DROP; an "
                     "unresolvable foreign key "

diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py
index 3563b88dbf7e9b323aebb111c58b020ad0c4cb70..b0188aa5a02ea89b9d6ed21548f1152fa6d4919d 100644 (file)
--- a/lib/sqlalchemy/testing/plugin/plugin_base.py
+++ b/lib/sqlalchemy/testing/plugin/plugin_base.py
@@ -329,7 +329,6 @@ def _prep_testing_database(options, file_config):
 
             if config.requirements.schemas.enabled_for_config(cfg):
                 util.drop_all_tables(e, inspector, schema=cfg.test_schema)
-                util.drop_all_tables(e, inspector, schema=cfg.test_schema_2)
 
             if against(cfg, "postgresql"):
                 from sqlalchemy.dialects import postgresql