Merge "fully implement future engine and remove legacy" into main

5 files changed, 4 insertions, 39 deletions

diff --git a/test/dialect/mssql/test_reflection.py b/test/dialect/mssql/test_reflection.py
index 1fa301e28..01c5e845e 100644
--- a/test/dialect/mssql/test_reflection.py
+++ b/test/dialect/mssql/test_reflection.py
@@ -348,6 +348,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables, AssertsCompiledSQL):
                 assert c2.dialect.has_table(
                     c2, "#myveryveryuniquetemptablename"
                 )
+                c2.rollback()
             finally:
                 with c1.begin():
                     c1.exec_driver_sql(
diff --git a/test/dialect/mysql/test_dialect.py b/test/dialect/mysql/test_dialect.py
index 705a7f672..834e1874c 100644
--- a/test/dialect/mysql/test_dialect.py
+++ b/test/dialect/mysql/test_dialect.py
@@ -24,7 +24,6 @@ from sqlalchemy.testing import is_
 from sqlalchemy.testing import mock
 from sqlalchemy.testing.assertions import AssertsCompiledSQL
 from .test_compiler import ReservedWordFixture
-from ...engine import test_deprecations
 
 
 class BackendDialectTest(
@@ -105,6 +104,7 @@ class BackendDialectTest(
             isolation_level="AUTOCOMMIT"
         )
         assert c.exec_driver_sql("SELECT @@autocommit;").scalar()
+        c.rollback()
 
         c = c.execution_options(isolation_level="READ COMMITTED")
         assert not c.exec_driver_sql("SELECT @@autocommit;").scalar()
@@ -543,15 +543,3 @@ class ExecutionTest(fixtures.TestBase):
     def test_sysdate(self, connection):
         d = connection.execute(func.sysdate()).scalar()
         assert isinstance(d, datetime.datetime)
-
-
-class AutocommitTextTest(
-    test_deprecations.AutocommitKeywordFixture, fixtures.TestBase
-):
-    __only_on__ = "mysql", "mariadb"
-
-    def test_load_data(self):
-        self._test_keyword("LOAD DATA STUFF")
-
-    def test_replace(self):
-        self._test_keyword("REPLACE THING")
diff --git a/test/dialect/mysql/test_for_update.py b/test/dialect/mysql/test_for_update.py
index a99435c4a..5717a3299 100644
--- a/test/dialect/mysql/test_for_update.py
+++ b/test/dialect/mysql/test_for_update.py
@@ -76,11 +76,10 @@ class MySQLForUpdateLockingTest(fixtures.DeclarativeMappedTest):
     def run_test(self):
         connection = testing.db.connect()
         connection.exec_driver_sql("set innodb_lock_wait_timeout=1")
-        main_trans = connection.begin()
         try:
             yield Session(bind=connection)
         finally:
-            main_trans.rollback()
+            connection.rollback()
             connection.close()
 
     def _assert_a_is_locked(self, should_be_locked):
diff --git a/test/dialect/postgresql/test_dialect.py b/test/dialect/postgresql/test_dialect.py
index 6e665c71b..e7c4ebb7c 100644
--- a/test/dialect/postgresql/test_dialect.py
+++ b/test/dialect/postgresql/test_dialect.py
@@ -53,7 +53,6 @@ from sqlalchemy.testing.assertions import eq_regex
 from sqlalchemy.testing.assertions import ne_
 from sqlalchemy.util import u
 from sqlalchemy.util import ue
-from ...engine import test_deprecations
 
 if True:
     from sqlalchemy.dialects.postgresql.psycopg2 import (
@@ -1359,22 +1358,3 @@ $$ LANGUAGE plpgsql;
         engine = engines.testing_engine()
         with engine.connect() as conn:
             ne_(conn.connection.status, STATUS_IN_TRANSACTION)
-
-
-class AutocommitTextTest(test_deprecations.AutocommitTextTest):
-    __only_on__ = "postgresql"
-
-    def test_grant(self):
-        self._test_keyword("GRANT USAGE ON SCHEMA fooschema TO foorole")
-
-    def test_import_foreign_schema(self):
-        self._test_keyword("IMPORT FOREIGN SCHEMA foob")
-
-    def test_refresh_view(self):
-        self._test_keyword("REFRESH MATERIALIZED VIEW fooview")
-
-    def test_revoke(self):
-        self._test_keyword("REVOKE USAGE ON SCHEMA fooschema FROM foorole")
-
-    def test_truncate(self):
-        self._test_keyword("TRUNCATE footable")
diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py
index eb68c0c6f..a2fe81a4b 100644
--- a/test/dialect/test_sqlite.py
+++ b/test/dialect/test_sqlite.py
@@ -841,6 +841,7 @@ class AttachedDBTest(fixtures.TestBase):
         self.metadata = MetaData()
 
     def teardown_test(self):
+        self.conn.rollback()
         with self.conn.begin():
             self.metadata.drop_all(self.conn)
         self.conn.close()
@@ -2468,10 +2469,6 @@ class SavepointTest(fixtures.TablesTest):
         connection.close()
 
 
-class FutureSavepointTest(fixtures.FutureEngineMixin, SavepointTest):
-    pass
-
-
 class TypeReflectionTest(fixtures.TestBase):
 
     __only_on__ = "sqlite"