ydb-sqlalchemy 0.1.12__tar.gz → 0.1.14__tar.gz

{ydb_sqlalchemy-0.1.12/ydb_sqlalchemy.egg-info → ydb_sqlalchemy-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ydb-sqlalchemy
-Version: 0.1.12
+Version: 0.1.14
 Summary: YDB Dialect for SQLAlchemy
 Home-page: http://github.com/ydb-platform/ydb-sqlalchemy
 Author: Yandex LLC
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sqlalchemy<3.0.0,>=1.4.0
 Requires-Dist: ydb>=3.21.6
-Requires-Dist: ydb-dbapi>=0.1.10
+Requires-Dist: ydb-dbapi>=0.1.16
 Provides-Extra: yc
 Requires-Dist: yandexcloud; extra == "yc"
 

{ydb_sqlalchemy-0.1.12 → ydb_sqlalchemy-0.1.14}/requirements.txt

@@ -1,3 +1,3 @@
 sqlalchemy >= 1.4.0, < 3.0.0
 ydb >= 3.21.6
-ydb-dbapi >= 0.1.10
+ydb-dbapi >= 0.1.16

{ydb_sqlalchemy-0.1.12 → ydb_sqlalchemy-0.1.14}/setup.py

@@ -13,7 +13,7 @@ with open("requirements.txt") as f:
 
 setuptools.setup(
     name="ydb-sqlalchemy",
-    version="0.1.12",  # AUTOVERSION
+    version="0.1.14",  # AUTOVERSION
     description="YDB Dialect for SQLAlchemy",
     author="Yandex LLC",
     author_email="ydb@yandex-team.ru",

{ydb_sqlalchemy-0.1.12 → ydb_sqlalchemy-0.1.14}/test/test_suite.py

@@ -577,6 +577,19 @@ class ContainerTypesTest(fixtures.TablesTest):
 
         eq_(connection.execute(sa.select(table)).fetchall(), [(1,), (2,), (3,)])
 
+    def test_tuple_list_type_bind_variable_text(self, connection):
+        table = self.tables.container_types_test
+
+        connection.execute(sa.insert(table).values([{"id": 1}, {"id": 2}, {"id": 3}]))
+
+        stmt = select(table.c.id).where(
+            sa.text("(id, id) IN :tuple_arr_var").bindparams(
+                sa.bindparam("tuple_arr_var", type_=sa.ARRAY(sa.TupleType(sa.Integer, sa.Integer))),
+            )
+        )
+
+        eq_(connection.execute(stmt, {"tuple_arr_var": [(1, 1), (2, 2)]}).fetchall(), [(1,), (2,)])
+
 
 class ConcatTest(fixtures.TablesTest):
     @classmethod

ydb_sqlalchemy-0.1.14/ydb_sqlalchemy/_version.py

@@ -0,0 +1 @@
+VERSION = "0.1.14"

{ydb_sqlalchemy-0.1.12 → ydb_sqlalchemy-0.1.14}/ydb_sqlalchemy/sqlalchemy/__init__.py

@@ -99,6 +99,19 @@ class YdbRequestSettingsCharacteristic(characteristics.ConnectionCharacteristic)
         return dialect.get_ydb_request_settings(dbapi_connection)
 
 
+class YdbRetrySettingsCharacteristic(characteristics.ConnectionCharacteristic):
+    def reset_characteristic(self, dialect: "YqlDialect", dbapi_connection: ydb_dbapi.Connection) -> None:
+        dialect.reset_ydb_retry_settings(dbapi_connection)
+
+    def set_characteristic(
+        self, dialect: "YqlDialect", dbapi_connection: ydb_dbapi.Connection, value: ydb.RetrySettings
+    ) -> None:
+        dialect.set_ydb_retry_settings(dbapi_connection, value)
+
+    def get_characteristic(self, dialect: "YqlDialect", dbapi_connection: ydb_dbapi.Connection) -> ydb.RetrySettings:
+        return dialect.get_ydb_retry_settings(dbapi_connection)
+
+
 class YqlDialect(StrCompileDialect):
     name = "yql"
     driver = "ydb"
@@ -150,6 +163,7 @@ class YqlDialect(StrCompileDialect):
         {
             "isolation_level": characteristics.IsolationLevelCharacteristic(),
             "ydb_request_settings": YdbRequestSettingsCharacteristic(),
+            "ydb_retry_settings": YdbRetrySettingsCharacteristic(),
         }
     )
 
@@ -312,6 +326,19 @@ class YqlDialect(StrCompileDialect):
     def get_ydb_request_settings(self, dbapi_connection: ydb_dbapi.Connection) -> ydb.BaseRequestSettings:
         return dbapi_connection.get_ydb_request_settings()
 
+    def set_ydb_retry_settings(
+        self,
+        dbapi_connection: ydb_dbapi.Connection,
+        value: ydb.RetrySettings,
+    ) -> None:
+        dbapi_connection.set_ydb_retry_settings(value)
+
+    def reset_ydb_retry_settings(self, dbapi_connection: ydb_dbapi.Connection):
+        self.set_ydb_retry_settings(dbapi_connection, ydb.RetrySettings())
+
+    def get_ydb_retry_settings(self, dbapi_connection: ydb_dbapi.Connection) -> ydb.RetrySettings:
+        return dbapi_connection.get_ydb_retry_settings()
+
     def create_connect_args(self, url):
         args, kwargs = super().create_connect_args(url)
         # YDB database name should start with '/'

{ydb_sqlalchemy-0.1.12 → ydb_sqlalchemy-0.1.14}/ydb_sqlalchemy/sqlalchemy/compiler/base.py

@@ -228,6 +228,10 @@ class BaseYqlTypeCompiler(StrSQLTypeCompiler):
             ydb_type = ydb.DecimalType(precision, scale)
         elif isinstance(type_, (types.ListType, sa.ARRAY)):
             ydb_type = ydb.ListType(self.get_ydb_type(type_.item_type, is_optional=False))
+        elif isinstance(type_, sa.TupleType):
+            ydb_type = ydb.TupleType()
+            for item_type in type_.types:
+                ydb_type.add_element(self.get_ydb_type(item_type, is_optional=False))
         elif isinstance(type_, types.StructType):
             ydb_type = ydb.StructType()
             for field, field_type in type_.fields_types.items():

{ydb_sqlalchemy-0.1.12 → ydb_sqlalchemy-0.1.14}/ydb_sqlalchemy/sqlalchemy/dbapi_adapter.py

@@ -56,6 +56,12 @@ class AdaptedAsyncConnection(AdaptedConnection):
     def get_ydb_request_settings(self) -> ydb.BaseRequestSettings:
         return self._connection.get_ydb_request_settings()
 
+    def set_ydb_retry_settings(self, value: ydb.RetrySettings) -> None:
+        self._connection.set_ydb_retry_settings(value)
+
+    def get_ydb_retry_settings(self) -> ydb.RetrySettings:
+        return self._connection.get_ydb_retry_settings()
+
     def describe(self, table_path: str):
         return await_only(self._connection.describe(table_path))
 

{ydb_sqlalchemy-0.1.12 → ydb_sqlalchemy-0.1.14/ydb_sqlalchemy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ydb-sqlalchemy
-Version: 0.1.12
+Version: 0.1.14
 Summary: YDB Dialect for SQLAlchemy
 Home-page: http://github.com/ydb-platform/ydb-sqlalchemy
 Author: Yandex LLC
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sqlalchemy<3.0.0,>=1.4.0
 Requires-Dist: ydb>=3.21.6
-Requires-Dist: ydb-dbapi>=0.1.10
+Requires-Dist: ydb-dbapi>=0.1.16
 Provides-Extra: yc
 Requires-Dist: yandexcloud; extra == "yc"
 

{ydb_sqlalchemy-0.1.12 → ydb_sqlalchemy-0.1.14}/ydb_sqlalchemy.egg-info/requires.txt

@@ -1,6 +1,6 @@
 sqlalchemy<3.0.0,>=1.4.0
 ydb>=3.21.6
-ydb-dbapi>=0.1.10
+ydb-dbapi>=0.1.16
 
 [yc]
 yandexcloud

ydb_sqlalchemy-0.1.12/ydb_sqlalchemy/_version.py

@@ -1 +0,0 @@
-VERSION = "0.1.12"