Merge "test fixes for oracle 18c"

2 files changed, 17 insertions, 2 deletions

diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 852bafe5b..94c4aacbd 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -1895,11 +1895,13 @@ class OracleDialect(default.DefaultDialect):
                 col.default_on_null,
                 (
                     SELECT id.generation_type || ',' || id.IDENTITY_OPTIONS
-                    FROM ALL_TAB_IDENTITY_COLS id
+                    FROM ALL_TAB_IDENTITY_COLS%(dblink)s id
                     WHERE col.table_name = id.table_name
                     AND col.column_name = id.column_name
                     AND col.owner = id.owner
-                ) AS identity_options"""
+                ) AS identity_options""" % {
+                "dblink": dblink
+            }
         else:
             identity_cols = "NULL as default_on_null, NULL as identity_options"
 
diff --git a/lib/sqlalchemy/dialects/oracle/provision.py b/lib/sqlalchemy/dialects/oracle/provision.py
index aadc2c5a9..d51131c0b 100644
--- a/lib/sqlalchemy/dialects/oracle/provision.py
+++ b/lib/sqlalchemy/dialects/oracle/provision.py
@@ -8,6 +8,7 @@ from ...testing.provision import follower_url_from_main
 from ...testing.provision import log
 from ...testing.provision import run_reap_dbs
 from ...testing.provision import set_default_schema_on_connection
+from ...testing.provision import stop_test_class
 from ...testing.provision import temp_table_keyword_args
 from ...testing.provision import update_db_opts
 
@@ -61,6 +62,18 @@ def _oracle_update_db_opts(db_url, db_opts):
     pass
 
 
+@stop_test_class.for_db("oracle")
+def stop_test_class(config, db, cls):
+    """run magic command to get rid of identity sequences
+
+    # https://floo.bar/2019/11/29/drop-the-underlying-sequence-of-an-identity-column/
+
+    """
+
+    with db.begin() as conn:
+        conn.exec_driver_sql("purge recyclebin")
+
+
 @run_reap_dbs.for_db("oracle")
 def _reap_oracle_dbs(url, idents):
     log.info("db reaper connecting to %r", url)