Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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
27 changes: 27 additions & 0 deletions ydb_sqlalchemy/sqlalchemy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,19 @@ def get_characteristic(
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"
Expand Down Expand Up @@ -150,6 +163,7 @@ class YqlDialect(StrCompileDialect):
{
"isolation_level": characteristics.IsolationLevelCharacteristic(),
"ydb_request_settings": YdbRequestSettingsCharacteristic(),
"ydb_retry_settings": YdbRetrySettingsCharacteristic(),
}
)

Expand Down Expand Up @@ -312,6 +326,19 @@ def reset_ydb_request_settings(self, dbapi_connection: ydb_dbapi.Connection):
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 '/'
Expand Down
6 changes: 6 additions & 0 deletions ydb_sqlalchemy/sqlalchemy/dbapi_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ def set_ydb_request_settings(self, value: ydb.BaseRequestSettings) -> None:
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))

Expand Down