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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ydb-sqlalchemy
-Version: 0.1.10
+Version: 0.1.12
 Summary: YDB Dialect for SQLAlchemy
 Home-page: http://github.com/ydb-platform/ydb-sqlalchemy
 Author: Yandex LLC
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sqlalchemy<3.0.0,>=1.4.0
-Requires-Dist: ydb>=3.18.8
+Requires-Dist: ydb>=3.21.6
 Requires-Dist: ydb-dbapi>=0.1.10
 Provides-Extra: yc
 Requires-Dist: yandexcloud; extra == "yc"
@@ -22,11 +22,18 @@ Requires-Dist: yandexcloud; extra == "yc"
 ---
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/blob/main/LICENSE)
 [![PyPI version](https://badge.fury.io/py/ydb-sqlalchemy.svg)](https://badge.fury.io/py/ydb-sqlalchemy)
+[![API Reference](https://img.shields.io/badge/API-Reference-lightgreen.svg)](https://ydb-platform.github.io/ydb-sqlalchemy/api/index.html)
 [![Functional tests](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/tests.yml/badge.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/tests.yml)
 [![Style checks](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/style.yml/badge.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/style.yml)
 
 This repository contains YQL dialect for SqlAlchemy 2.0.
 
+---
+
+**Documentation**: <a href="https://ydb-platform.github.io/ydb-sqlalchemy" target="_blank">https://ydb-platform.github.io/ydb-sqlalchemy</a>
+
+---
+
 **Note**: Dialect also works with SqlAlchemy 1.4, but it is not fully tested.
 
 

{ydb_sqlalchemy-0.1.10 → ydb_sqlalchemy-0.1.12}/README.md

@@ -2,11 +2,18 @@
 ---
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/blob/main/LICENSE)
 [![PyPI version](https://badge.fury.io/py/ydb-sqlalchemy.svg)](https://badge.fury.io/py/ydb-sqlalchemy)
+[![API Reference](https://img.shields.io/badge/API-Reference-lightgreen.svg)](https://ydb-platform.github.io/ydb-sqlalchemy/api/index.html)
 [![Functional tests](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/tests.yml/badge.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/tests.yml)
 [![Style checks](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/style.yml/badge.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/style.yml)
 
 This repository contains YQL dialect for SqlAlchemy 2.0.
 
+---
+
+**Documentation**: <a href="https://ydb-platform.github.io/ydb-sqlalchemy" target="_blank">https://ydb-platform.github.io/ydb-sqlalchemy</a>
+
+---
+
 **Note**: Dialect also works with SqlAlchemy 1.4, but it is not fully tested.
 
 
@@ -168,4 +175,4 @@ It is possible to use YDB SA engine with `pandas` fuctions [to_sql()](https://pa
 
 * `to_sql` is not fully optimized to load huge datasets. It is recommended to use `method="multi"` and avoid setting a very large `chunksize`.
 
-* `read_sql` is not fully optimized to load huge datasets and could lead to significant memory consumptions.
+* `read_sql` is not fully optimized to load huge datasets and could lead to significant memory consumptions.

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

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

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

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

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

@@ -1,4 +1,5 @@
 import ctypes
+import datetime
 import decimal
 
 import pytest
@@ -424,6 +425,16 @@ class DateTest(_DateTest):
     run_dispose_bind = "once"
 
 
+class Date32Test(_DateTest):
+    run_dispose_bind = "once"
+    datatype = ydb_sa_types.YqlDate32
+    data = datetime.date(1969, 1, 1)
+
+    @pytest.mark.skip("Default binding for DATE is not compatible with Date32")
+    def test_select_direct(self, connection):
+        pass
+
+
 class DateTimeMicrosecondsTest(_DateTimeMicrosecondsTest):
     run_dispose_bind = "once"
 
@@ -432,10 +443,30 @@ class DateTimeTest(_DateTimeTest):
     run_dispose_bind = "once"
 
 
+class DateTime64Test(_DateTimeTest):
+    datatype = ydb_sa_types.YqlDateTime64
+    data = datetime.datetime(1969, 10, 15, 12, 57, 18)
+    run_dispose_bind = "once"
+
+    @pytest.mark.skip("Default binding for DATETIME is not compatible with DateTime64")
+    def test_select_direct(self, connection):
+        pass
+
+
 class TimestampMicrosecondsTest(_TimestampMicrosecondsTest):
     run_dispose_bind = "once"
 
 
+class Timestamp64MicrosecondsTest(_TimestampMicrosecondsTest):
+    run_dispose_bind = "once"
+    datatype = ydb_sa_types.YqlTimestamp64
+    data = datetime.datetime(1969, 10, 15, 12, 57, 18, 396)
+
+    @pytest.mark.skip("Default binding for TIMESTAMP is not compatible with Timestamp64")
+    def test_select_direct(self, connection):
+        pass
+
+
 @pytest.mark.skip("unsupported Time data type")
 class TimeTest(_TimeTest):
     pass

ydb_sqlalchemy-0.1.12/ydb_sqlalchemy/_version.py

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

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

@@ -61,6 +61,9 @@ COLUMN_TYPES = {
     ydb.DecimalType: sa.DECIMAL,
     ydb.PrimitiveType.Yson: sa.TEXT,
     ydb.PrimitiveType.Date: sa.DATE,
+    ydb.PrimitiveType.Date32: sa.DATE,
+    ydb.PrimitiveType.Timestamp64: sa.TIMESTAMP,
+    ydb.PrimitiveType.Datetime64: sa.DATETIME,
     ydb.PrimitiveType.Datetime: sa.DATETIME,
     ydb.PrimitiveType.Timestamp: sa.TIMESTAMP,
     ydb.PrimitiveType.Interval: sa.INTEGER,

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

@@ -135,6 +135,15 @@ class BaseYqlTypeCompiler(StrSQLTypeCompiler):
     def visit_TIMESTAMP(self, type_: sa.TIMESTAMP, **kw):
         return "Timestamp"
 
+    def visit_date32(self, type_: types.YqlDate32, **kw):
+        return "Date32"
+
+    def visit_timestamp64(self, type_: types.YqlTimestamp64, **kw):
+        return "Timestamp64"
+
+    def visit_datetime64(self, type_: types.YqlDateTime64, **kw):
+        return "DateTime64"
+
     def visit_list_type(self, type_: types.ListType, **kw):
         inner = self.process(type_.item_type, **kw)
         return f"List<{inner}>"
@@ -193,6 +202,12 @@ class BaseYqlTypeCompiler(StrSQLTypeCompiler):
         elif isinstance(type_, types.YqlJSON.YqlJSONPathType):
             ydb_type = ydb.PrimitiveType.Utf8
         # Json
+        elif isinstance(type_, types.YqlDate32):
+            ydb_type = ydb.PrimitiveType.Date32
+        elif isinstance(type_, types.YqlTimestamp64):
+            ydb_type = ydb.PrimitiveType.Timestamp64
+        elif isinstance(type_, types.YqlDateTime64):
+            ydb_type = ydb.PrimitiveType.Datetime64
         elif isinstance(type_, sa.DATETIME):
             ydb_type = ydb.PrimitiveType.Datetime
         elif isinstance(type_, sa.TIMESTAMP):

{ydb_sqlalchemy-0.1.10 → ydb_sqlalchemy-0.1.12}/ydb_sqlalchemy/sqlalchemy/datetime_types.py

@@ -36,3 +36,39 @@ class YqlDateTime(YqlTimestamp, sqltypes.DATETIME):
             return int(value.timestamp())
 
         return process
+
+
+class YqlDate32(YqlDate):
+    __visit_name__ = "date32"
+
+    def literal_processor(self, dialect):
+        parent = super().literal_processor(dialect)
+
+        def process(value):
+            return f"Date32({parent(value)})"
+
+        return process
+
+
+class YqlTimestamp64(YqlTimestamp):
+    __visit_name__ = "timestamp64"
+
+    def literal_processor(self, dialect):
+        parent = super().literal_processor(dialect)
+
+        def process(value):
+            return f"Timestamp64({parent(value)})"
+
+        return process
+
+
+class YqlDateTime64(YqlDateTime):
+    __visit_name__ = "datetime64"
+
+    def literal_processor(self, dialect):
+        parent = super().literal_processor(dialect)
+
+        def process(value):
+            return f"DateTime64({parent(value)})"
+
+        return process

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

@@ -66,7 +66,10 @@ class AdaptedAsyncConnection(AdaptedConnection):
         return await_only(self._connection.get_table_names())
 
 
+# TODO(vgvoleg): Migrate to AsyncAdapt_dbapi_cursor and AsyncAdapt_dbapi_connection
 class AdaptedAsyncCursor:
+    _awaitable_cursor_close: bool = False
+
     def __init__(self, cursor: AsyncCursor):
         self._cursor = cursor
 
@@ -112,3 +115,6 @@ class AdaptedAsyncCursor:
 
     def setoutputsizes(self, *args):
         pass
+
+    async def _async_soft_close(self) -> None:
+        pass

{ydb_sqlalchemy-0.1.10 → ydb_sqlalchemy-0.1.12}/ydb_sqlalchemy/sqlalchemy/types.py

@@ -11,7 +11,7 @@ else:
 from sqlalchemy import ARRAY, exc, types
 from sqlalchemy.sql import type_api
 
-from .datetime_types import YqlDate, YqlDateTime, YqlTimestamp  # noqa: F401
+from .datetime_types import YqlDate, YqlDateTime, YqlTimestamp, YqlDate32, YqlTimestamp64, YqlDateTime64  # noqa: F401
 from .json import YqlJSON  # noqa: F401
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ydb-sqlalchemy
-Version: 0.1.10
+Version: 0.1.12
 Summary: YDB Dialect for SQLAlchemy
 Home-page: http://github.com/ydb-platform/ydb-sqlalchemy
 Author: Yandex LLC
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: sqlalchemy<3.0.0,>=1.4.0
-Requires-Dist: ydb>=3.18.8
+Requires-Dist: ydb>=3.21.6
 Requires-Dist: ydb-dbapi>=0.1.10
 Provides-Extra: yc
 Requires-Dist: yandexcloud; extra == "yc"
@@ -22,11 +22,18 @@ Requires-Dist: yandexcloud; extra == "yc"
 ---
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/blob/main/LICENSE)
 [![PyPI version](https://badge.fury.io/py/ydb-sqlalchemy.svg)](https://badge.fury.io/py/ydb-sqlalchemy)
+[![API Reference](https://img.shields.io/badge/API-Reference-lightgreen.svg)](https://ydb-platform.github.io/ydb-sqlalchemy/api/index.html)
 [![Functional tests](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/tests.yml/badge.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/tests.yml)
 [![Style checks](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/style.yml/badge.svg)](https://github.com/ydb-platform/ydb-sqlalchemy/actions/workflows/style.yml)
 
 This repository contains YQL dialect for SqlAlchemy 2.0.
 
+---
+
+**Documentation**: <a href="https://ydb-platform.github.io/ydb-sqlalchemy" target="_blank">https://ydb-platform.github.io/ydb-sqlalchemy</a>
+
+---
+
 **Note**: Dialect also works with SqlAlchemy 1.4, but it is not fully tested.
 
 

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

@@ -1,5 +1,5 @@
 sqlalchemy<3.0.0,>=1.4.0
-ydb>=3.18.8
+ydb>=3.21.6
 ydb-dbapi>=0.1.10
 
 [yc]

ydb_sqlalchemy-0.1.10/ydb_sqlalchemy/_version.py

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