reydb 1.1.58__py3-none-any.whl → 1.1.59__py3-none-any.whl

reydb/rbase.py

@@ -12,7 +12,8 @@
 from typing import Any, TypedDict, Literal, TypeVar
 from enum import EnumType
 from sqlalchemy import Engine, Connection, Transaction, text as sqlalchemy_text
-from sqlalchemy.ext.asyncio import AsyncEngine, AsyncConnection, AsyncTransaction
+from sqlalchemy.orm import Session, SessionTransaction
+from sqlalchemy.ext.asyncio import AsyncEngine, AsyncConnection, AsyncTransaction, AsyncSession, AsyncSessionTransaction
 from sqlalchemy.engine.url import URL
 from sqlalchemy.sql.elements import TextClause
 from reykit.rbase import Base, throw
@@ -36,10 +37,18 @@ __all__ = (
 EngineT = TypeVar('EngineT', Engine, AsyncEngine)
 ConnectionT = TypeVar('ConnectionT', Connection, AsyncConnection)
 TransactionT = TypeVar('TransactionT', Transaction, AsyncTransaction)
+SessionT = TypeVar('SessionT', Session, AsyncSession)
+SessionTransactionT = TypeVar('SessionTransactionT', SessionTransaction, AsyncSessionTransaction)
 DatabaseT = TypeVar('DatabaseT')
 DatabaseConnectionT = TypeVar('DatabaseConnectionT')
 DatabaseExecuteT = TypeVar('DatabaseExecuteT')
 DatabaseSchemaT = TypeVar('DatabaseSchemaT')
+DatabaseORMT = TypeVar('DatabaseORMT')
+DatabaseORMSessionT = TypeVar('DatabaseSessionT')
+DatabaseORMStatementSelectT = TypeVar('DatabaseORMStatementSelectT')
+DatabaseORMStatementInsertT = TypeVar('DatabaseORMStatementInsertT')
+DatabaseORMStatementUpdateT = TypeVar('DatabaseORMStatementUpdateT')
+DatabaseORMStatementDeleteT = TypeVar('DatabaseORMStatementDeleteT')
 
 
 URLParameters = TypedDict(

reydb/rconn.py

@@ -63,6 +63,39 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
     """
 
 
+    def __enter__(self) -> Self:
+        """
+        Enter syntax `with`.
+
+        Returns
+        -------
+        Self.
+        """
+
+        return self
+
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        *_
+    ) -> None:
+        """
+        Exit syntax `with`.
+
+        Parameters
+        ----------
+        exc_type : Exception type.
+        """
+
+        # Commit.
+        if exc_type is None:
+            self.commit()
+
+        # Close.
+        self.close()
+
+
     def get_conn(self) -> Connection:
         """
         Get `Connection` instance.
@@ -132,9 +165,32 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
             self.conn = None
 
 
-    def __enter__(self) -> Self:
+    def insert_id(self) -> int:
         """
-        Enter syntax `with`.
+        Return last self increasing ID.
+
+        Returns
+        -------
+        ID.
+        """
+
+        # Get.
+        sql = 'SELECT LAST_INSERT_ID()'
+        result = self.execute(sql)
+        insert_id = result.scalar()
+
+        return insert_id
+
+
+class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexec.DatabaseExecuteAsync', AsyncConnection, AsyncTransaction]):
+    """
+    Asynchronous database connection type.
+    """
+
+
+    async def __aenter__(self):
+        """
+        Asynchronous enter syntax `async with`.
 
         Returns
         -------
@@ -144,13 +200,13 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
         return self
 
 
-    def __exit__(
+    async def __aexit__(
         self,
         exc_type: type[BaseException] | None,
         *_
     ) -> None:
         """
-        Exit syntax `with`.
+        Asynchronous exit syntax `async with`.
 
         Parameters
         ----------
@@ -159,38 +215,16 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
 
         # Commit.
         if exc_type is None:
-            self.commit()
+            await self.commit()
 
         # Close.
-        self.close()
-
-
-    def insert_id(self) -> int:
-        """
-        Return last self increasing ID.
-
-        Returns
-        -------
-        ID.
-        """
-
-        # Get.
-        sql = 'SELECT LAST_INSERT_ID()'
-        result = self.execute(sql)
-        insert_id = result.scalar()
-
-        return insert_id
-
-
-class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexec.DatabaseExecuteAsync', AsyncConnection, AsyncTransaction]):
-    """
-    Asynchronous database connection type.
-    """
+        await self.close()
+        await self.db.dispose()
 
 
     async def get_conn(self) -> AsyncConnection:
         """
-        Asynchronous get `Connection` instance.
+        Asynchronous get `AsyncConnection` instance.
 
         Returns
         -------
@@ -206,7 +240,7 @@ class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexe
 
     async def get_begin(self) -> AsyncTransaction:
         """
-        Asynchronous get `Transaction` instance.
+        Asynchronous get `AsyncTransaction` instance.
 
         Returns
         -------
@@ -257,40 +291,6 @@ class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexe
             self.conn = None
 
 
-    async def __aenter__(self):
-        """
-        Asynchronous enter syntax `async with`.
-
-        Returns
-        -------
-        Self.
-        """
-
-        return self
-
-
-    async def __aexit__(
-        self,
-        exc_type: type[BaseException] | None,
-        *_
-    ) -> None:
-        """
-        Asynchronous exit syntax `async with`.
-
-        Parameters
-        ----------
-        exc_type : Exception type.
-        """
-
-        # Commit.
-        if exc_type is None:
-            await self.commit()
-
-        # Close.
-        await self.close()
-        await self.db.dispose()
-
-
     async def insert_id(self) -> int:
         """
         Asynchronous return last self increasing ID.

reydb/rdb.py

@@ -9,7 +9,7 @@
 """
 
 
-from typing import Generic
+from typing import TypeVar, Generic
 from urllib.parse import quote as urllib_quote
 from pymysql.constants.CLIENT import MULTI_STATEMENTS
 from sqlalchemy import Engine, create_engine as sqlalchemy_create_engine
@@ -32,7 +32,8 @@ class DatabaseSuper(
         rbase.EngineT,
         rbase.DatabaseConnectionT,
         rbase.DatabaseExecuteT,
-        rbase.DatabaseSchemaT
+        rbase.DatabaseSchemaT,
+        rbase.DatabaseORMT
     ]
 ):
     """
@@ -278,7 +279,7 @@ class DatabaseSuper(
 
 
     @property
-    def orm(self):
+    def orm(self) -> 'rbase.DatabaseORMT':
         """
         Build database ORM instance.
 
@@ -288,7 +289,11 @@ class DatabaseSuper(
         """
 
         # Build.
-        orm = rorm.DatabaseORM(self)
+        match self:
+            case Database():
+                orm = rorm.DatabaseORM(self)
+            case DatabaseAsync():
+                orm = rorm.DatabaseORMAsync(self)
 
         return orm
 
@@ -484,7 +489,8 @@ class Database(
         Engine,
         'rconn.DatabaseConnection',
         'rexec.DatabaseExecute',
-        'rparam.DatabaseSchema'
+        'rparam.DatabaseSchema',
+        'rorm.DatabaseORM'
     ]
 ):
     """
@@ -497,7 +503,8 @@ class DatabaseAsync(
         AsyncEngine,
         'rconn.DatabaseConnectionAsync',
         'rexec.DatabaseExecuteAsync',
-        'rparam.DatabaseSchemaAsync'
+        'rparam.DatabaseSchemaAsync',
+        'rorm.DatabaseORMAsync'
     ]
 ):
     """