Attempt to support sqlalchemy 1.4+

ydb-platform · Nov 13, 2024 · 80425d9 · 80425d9
1 parent 3c83092
commit 80425d9
Show file tree

Hide file tree

Showing 10 changed files with 861 additions and 555 deletions.
diff --git a/test/test_core.py b/test/test_core.py
@@ -94,7 +94,7 @@ def test_sa_crud(self, connection):
             (5, "c"),
         ]
 
-    def test_cached_query(self, connection_no_trans: sa.Connection, connection: sa.Connection):
+    def test_cached_query(self, connection_no_trans, connection):
         table = self.tables.test
 
         with connection_no_trans.begin() as transaction:
@@ -263,7 +263,7 @@ def test_integer_types(self, connection):
         result = connection.execute(stmt).fetchone()
         assert result == (b"Uint8", b"Uint16", b"Uint32", b"Uint64", b"Int8", b"Int16", b"Int32", b"Int64")
 
-    def test_datetime_types(self, connection: sa.Connection):
+    def test_datetime_types(self, connection):
         stmt = sa.Select(
             sa.func.FormatType(sa.func.TypeOf(sa.bindparam("p_datetime", datetime.datetime.now(), sa.DateTime))),
             sa.func.FormatType(sa.func.TypeOf(sa.bindparam("p_DATETIME", datetime.datetime.now(), sa.DATETIME))),
@@ -273,7 +273,7 @@ def test_datetime_types(self, connection: sa.Connection):
         result = connection.execute(stmt).fetchone()
         assert result == (b"Timestamp", b"Datetime", b"Timestamp")
 
-    def test_datetime_types_timezone(self, connection: sa.Connection):
+    def test_datetime_types_timezone(self, connection):
         table = self.tables.test_datetime_types
         tzinfo = datetime.timezone(datetime.timedelta(hours=3, minutes=42))
 
@@ -476,7 +476,7 @@ def define_tables(cls, metadata: sa.MetaData):
             Column("id", Integer, primary_key=True),
         )
 
-    def test_rollback(self, connection_no_trans: sa.Connection, connection: sa.Connection):
+    def test_rollback(self, connection_no_trans, connection):
         table = self.tables.test
 
         connection_no_trans.execution_options(isolation_level=IsolationLevel.SERIALIZABLE)
@@ -491,7 +491,7 @@ def test_rollback(self, connection_no_trans: sa.Connection, connection: sa.Conne
         result = cursor.fetchall()
         assert result == []
 
-    def test_commit(self, connection_no_trans: sa.Connection, connection: sa.Connection):
+    def test_commit(self, connection_no_trans, connection):
         table = self.tables.test
 
         connection_no_trans.execution_options(isolation_level=IsolationLevel.SERIALIZABLE)
@@ -506,9 +506,7 @@ def test_commit(self, connection_no_trans: sa.Connection, connection: sa.Connect
         assert set(result) == {(3,), (4,)}
 
     @pytest.mark.parametrize("isolation_level", (IsolationLevel.SERIALIZABLE, IsolationLevel.SNAPSHOT_READONLY))
-    def test_interactive_transaction(
-        self, connection_no_trans: sa.Connection, connection: sa.Connection, isolation_level
-    ):
+    def test_interactive_transaction(self, connection_no_trans, connection, isolation_level):
         table = self.tables.test
         dbapi_connection: dbapi.Connection = connection_no_trans.connection.dbapi_connection
 
@@ -535,9 +533,7 @@ def test_interactive_transaction(
             IsolationLevel.AUTOCOMMIT,
         ),
     )
-    def test_not_interactive_transaction(
-        self, connection_no_trans: sa.Connection, connection: sa.Connection, isolation_level
-    ):
+    def test_not_interactive_transaction(self, connection_no_trans, connection, isolation_level):
         table = self.tables.test
         dbapi_connection: dbapi.Connection = connection_no_trans.connection.dbapi_connection
 
@@ -573,7 +569,7 @@ class IsolationSettings(NamedTuple):
         IsolationLevel.SNAPSHOT_READONLY: IsolationSettings(ydb.QuerySnapshotReadOnly().name, True),
     }
 
-    def test_connection_set(self, connection_no_trans: sa.Connection):
+    def test_connection_set(self, connection_no_trans):
         dbapi_connection: dbapi.Connection = connection_no_trans.connection.dbapi_connection
 
         for sa_isolation_level, ydb_isolation_settings in self.YDB_ISOLATION_SETTINGS_MAP.items():
@@ -861,7 +857,7 @@ def test_insert_in_name_and_field(self, connection):
 class TestSecondaryIndex(TestBase):
     __backend__ = True
 
-    def test_column_indexes(self, connection: sa.Connection, metadata: sa.MetaData):
+    def test_column_indexes(self, connection, metadata: sa.MetaData):
         table = Table(
             "test_column_indexes/table",
             metadata,
@@ -884,7 +880,7 @@ def test_column_indexes(self, connection: sa.Connection, metadata: sa.MetaData):
         index1 = indexes_map["ix_test_column_indexes_table_index_col2"]
         assert index1.index_columns == ["index_col2"]
 
-    def test_async_index(self, connection: sa.Connection, metadata: sa.MetaData):
+    def test_async_index(self, connection, metadata: sa.MetaData):
         table = Table(
             "test_async_index/table",
             metadata,
@@ -903,7 +899,7 @@ def test_async_index(self, connection: sa.Connection, metadata: sa.MetaData):
         assert set(index.index_columns) == {"index_col1", "index_col2"}
         # TODO: Check type after https://github.com/ydb-platform/ydb-python-sdk/issues/351
 
-    def test_cover_index(self, connection: sa.Connection, metadata: sa.MetaData):
+    def test_cover_index(self, connection, metadata: sa.MetaData):
         table = Table(
             "test_cover_index/table",
             metadata,
@@ -922,7 +918,7 @@ def test_cover_index(self, connection: sa.Connection, metadata: sa.MetaData):
         assert set(index.index_columns) == {"index_col1"}
         # TODO: Check covered columns after https://github.com/ydb-platform/ydb-python-sdk/issues/409
 
-    def test_indexes_reflection(self, connection: sa.Connection, metadata: sa.MetaData):
+    def test_indexes_reflection(self, connection, metadata: sa.MetaData):
         table = Table(
             "test_indexes_reflection/table",
             metadata,
@@ -948,7 +944,7 @@ def test_indexes_reflection(self, connection: sa.Connection, metadata: sa.MetaDa
             "test_async_cover_index": {"index_col1"},
         }
 
-    def test_index_simple_usage(self, connection: sa.Connection, metadata: sa.MetaData):
+    def test_index_simple_usage(self, connection, metadata: sa.MetaData):
         persons = Table(
             "test_index_simple_usage/persons",
             metadata,
@@ -979,7 +975,7 @@ def test_index_simple_usage(self, connection: sa.Connection, metadata: sa.MetaDa
         cursor = connection.execute(select_stmt)
         assert cursor.scalar_one() == "Sarah Connor"
 
-    def test_index_with_join_usage(self, connection: sa.Connection, metadata: sa.MetaData):
+    def test_index_with_join_usage(self, connection, metadata: sa.MetaData):
         persons = Table(
             "test_index_with_join_usage/persons",
             metadata,
@@ -1033,7 +1029,7 @@ def test_index_with_join_usage(self, connection: sa.Connection, metadata: sa.Met
         cursor = connection.execute(select_stmt)
         assert cursor.one() == ("Sarah Connor", "wanted")
 
-    def test_index_deletion(self, connection: sa.Connection, metadata: sa.MetaData):
+    def test_index_deletion(self, connection, metadata: sa.MetaData):
         persons = Table(
             "test_index_deletion/persons",
             metadata,
@@ -1062,7 +1058,7 @@ def define_tables(cls, metadata: sa.MetaData):
         Table("table", metadata, sa.Column("id", sa.Integer, primary_key=True))
 
     @classmethod
-    def insert_data(cls, connection: sa.Connection):
+    def insert_data(cls, connection):
         table = cls.tables["some_dir/nested_dir/table"]
         root_table = cls.tables["table"]
 

diff --git a/test/test_suite.py b/test/test_suite.py
@@ -68,6 +68,7 @@
 from sqlalchemy.testing.suite.test_types import DateTimeTest as _DateTimeTest
 from sqlalchemy.testing.suite.test_types import IntegerTest as _IntegerTest
 from sqlalchemy.testing.suite.test_types import JSONTest as _JSONTest
+
 from sqlalchemy.testing.suite.test_types import NativeUUIDTest as _NativeUUIDTest
 from sqlalchemy.testing.suite.test_types import NumericTest as _NumericTest
 from sqlalchemy.testing.suite.test_types import StringTest as _StringTest
@@ -78,6 +79,7 @@
     TimestampMicrosecondsTest as _TimestampMicrosecondsTest,
 )
 from sqlalchemy.testing.suite.test_types import TimeTest as _TimeTest
+
 from sqlalchemy.testing.suite.test_types import TrueDivTest as _TrueDivTest
 
 from ydb_sqlalchemy.sqlalchemy import types as ydb_sa_types

diff --git a/tox.ini b/tox.ini
@@ -68,4 +68,5 @@ max-line-length = 120
 ignore=E203,W503
 per-file-ignores =
     ydb_sqlalchemy/__init__.py: F401
+    ydb_sqlalchemy/sqlalchemy/compiler/__init__.py: F401
 exclude=*_pb2.py,*_grpc.py,.venv,.git,.tox,dist,doc,*egg,docs/*