reydb 1.1.57__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,9 +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/rbuild.py

@@ -57,7 +57,7 @@ class DatabaseBuild(DatabaseBase):
 
         Parameters
         ----------
-        db: `Database` instance.
+        db: Database instance.
         """
 
         # Set attribute.

reydb/rconfig.py

@@ -20,6 +20,7 @@ from datetime import (
 from reykit.rbase import Null, throw
 
 from . import rdb
+from .rbase import DatabaseBase
 
 
 __all__ = (
@@ -33,7 +34,7 @@ type ConfigTable = list[ConfigRow]
 ConfigValueT = TypeVar('T', bound=ConfigValue) # Any.
 
 
-class DatabaseConfig(object):
+class DatabaseConfig(DatabaseBase):
     """
     Database config type.
     Can create database used `self.build_db` method.
@@ -54,7 +55,7 @@ class DatabaseConfig(object):
 
         Parameters
         ----------
-        db: `Database` instance.
+        db: Database instance.
         """
 
         # Build.

reydb/rconn.py

@@ -40,7 +40,7 @@ class DatabaseConnectionSuper(DatabaseBase, Generic[DatabaseT, DatabaseExecuteT,
 
         Parameters
         ----------
-        db : `Database` or `DatabaseAsync` instance.
+        db : Database instance.
         autocommit: Whether automatic commit execute.
         """
 
@@ -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
@@ -21,12 +21,21 @@ from . import rbase, rbuild, rconfig, rconn, rerror, rexec, rfile, rinfo, rorm,
 
 __all__ = (
     'DatabaseSuper',
-    'rdb.Database',
-    'rdb.DatabaseAsync'
+    'Database',
+    'DatabaseAsync'
 )
 
 
-class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseConnectionT, rbase.DatabaseExecuteT]):
+class DatabaseSuper(
+    rbase.DatabaseBase,
+    Generic[
+        rbase.EngineT,
+        rbase.DatabaseConnectionT,
+        rbase.DatabaseExecuteT,
+        rbase.DatabaseSchemaT,
+        rbase.DatabaseORMT
+    ]
+):
     """
     Database super type, based `MySQL`.
     """
@@ -108,7 +117,6 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
             if key not in filter_key
         }
         info['conn_count'] = self.conn_count
-        info['aconn_count'] = self.aconn_count
         text = join_data_text(info)
 
         return text
@@ -230,76 +238,6 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
         return keep_n, overflow_n
 
 
-    def schema(self, filter_default: bool = True) -> dict[str, dict[str, list[str]]]:
-        """
-        Get schemata of databases and tables and columns.
-
-        Parameters
-        ----------
-        filter_default : Whether filter default database.
-
-        Returns
-        -------
-        Schemata of databases and tables and columns.
-        """
-
-        # Handle parameter.
-        filter_db = (
-            'information_schema',
-            'performance_schema',
-            'mysql',
-            'sys'
-        )
-        if filter_default:
-            where_database = 'WHERE `SCHEMA_NAME` NOT IN :filter_db\n'
-            where_column = '    WHERE `TABLE_SCHEMA` NOT IN :filter_db\n'
-        else:
-            where_database = where_column = ''
-
-        # Select.
-        sql = (
-            'SELECT GROUP_CONCAT(`SCHEMA_NAME`) AS `TABLE_SCHEMA`, NULL AS `TABLE_NAME`, NULL AS `COLUMN_NAME`\n'
-            'FROM `information_schema`.`SCHEMATA`\n'
-            f'{where_database}'
-            'UNION ALL (\n'
-            '    SELECT `TABLE_SCHEMA`, `TABLE_NAME`, `COLUMN_NAME`\n'
-            '    FROM `information_schema`.`COLUMNS`\n'
-            f'{where_column}'
-            '    ORDER BY `TABLE_SCHEMA`, `TABLE_NAME`, `ORDINAL_POSITION`\n'
-            ')'
-        )
-        result = self.execute(sql, filter_db=filter_db)
-
-        # Convert.
-        database_names, *_ = result.fetchone()
-        database_names: list[str] = database_names.split(',')
-        schema_dict = {}
-        for database, table, column in result:
-            if database in database_names:
-                database_names.remove(database)
-
-            ## Index database.
-            if database not in schema_dict:
-                schema_dict[database] = {table: [column]}
-                continue
-            table_dict: dict = schema_dict[database]
-
-            ## Index table. 
-            if table not in table_dict:
-                table_dict[table] = [column]
-                continue
-            column_list: list = table_dict[table]
-
-            ## Add column.
-            column_list.append(column)
-
-        ## Add empty database.
-        for name in database_names:
-            schema_dict[name] = None
-
-        return schema_dict
-
-
     def connect(self, autocommit: bool = False) -> rbase.DatabaseConnectionT:
         """
         Build database connection instance.
@@ -341,7 +279,7 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
 
 
     @property
-    def orm(self):
+    def orm(self) -> 'rbase.DatabaseORMT':
         """
         Build database ORM instance.
 
@@ -351,51 +289,51 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
         """
 
         # Build.
-        orm = rorm.DatabaseORM(self)
+        match self:
+            case Database():
+                orm = rorm.DatabaseORM(self)
+            case DatabaseAsync():
+                orm = rorm.DatabaseORMAsync(self)
 
         return orm
 
 
     @property
-    def info(self):
+    def build(self):
         """
-        Build database information schema instance.
+        Build database build instance.
 
         Returns
         -------
         Instance.
+        """
 
-        Examples
-        --------
-        Get databases information of server.
-        >>> databases_info = DatabaseInformationSchema()
+        # Build.
+        dbbuild = rbuild.DatabaseBuild(self)
 
-        Get tables information of database.
-        >>> tables_info = DatabaseInformationSchema.database()
+        return dbbuild
 
-        Get columns information of table.
-        >>> columns_info = DatabaseInformationSchema.database.table()
 
-        Get database attribute.
-        >>> database_attr = DatabaseInformationSchema.database['attribute']
-
-        Get table attribute.
-        >>> database_attr = DatabaseInformationSchema.database.table['attribute']
+    @property
+    def file(self):
+        """
+        Build database file instance.
 
-        Get column attribute.
-        >>> database_attr = DatabaseInformationSchema.database.table.column['attribute']
+        Returns
+        -------
+        Instance.
         """
 
         # Build.
-        dbischema = rinfo.DatabaseInformationSchema(self)
+        dbfile = rfile.DatabaseFile(self)
 
-        return dbischema
+        return dbfile
 
 
     @property
-    def build(self):
+    def error(self):
         """
-        Build database build instance.
+        Build database error instance.
 
         Returns
         -------
@@ -403,15 +341,15 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
         """
 
         # Build.
-        dbbuild = rbuild.DatabaseBuild(self)
+        dbfile = rerror.DatabaseError(self)
 
-        return dbbuild
+        return dbfile
 
 
     @property
-    def file(self):
+    def config(self):
         """
-        Build database file instance.
+        Build database config instance.
 
         Returns
         -------
@@ -419,31 +357,51 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
         """
 
         # Build.
-        dbfile = rfile.DatabaseFile(self)
+        dbconfig = rconfig.DatabaseConfig(self)
 
-        return dbfile
+        return dbconfig
 
 
     @property
-    def error(self):
+    def info(self):
         """
-        Build database error instance.
+        Build database information schema instance.
 
         Returns
         -------
         Instance.
+
+        Examples
+        --------
+        Get databases information of server.
+        >>> databases_info = DatabaseInformationSchema()
+
+        Get tables information of database.
+        >>> tables_info = DatabaseInformationSchema.database()
+
+        Get columns information of table.
+        >>> columns_info = DatabaseInformationSchema.database.table()
+
+        Get database attribute.
+        >>> database_attr = DatabaseInformationSchema.database['attribute']
+
+        Get table attribute.
+        >>> database_attr = DatabaseInformationSchema.database.table['attribute']
+
+        Get column attribute.
+        >>> database_attr = DatabaseInformationSchema.database.table.column['attribute']
         """
 
         # Build.
-        dbfile = rerror.DatabaseError(self)
+        dbischema = rinfo.DatabaseInformationSchema(self)
 
-        return dbfile
+        return dbischema
 
 
     @property
-    def config(self):
+    def schema(self) -> rbase.DatabaseSchemaT:
         """
-        Build database config instance.
+        Build database schema instance.
 
         Returns
         -------
@@ -451,9 +409,13 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
         """
 
         # Build.
-        dbconfig = rconfig.DatabaseConfig(self)
+        match self:
+            case Database():
+                schema = rparam.DatabaseSchema(self)
+            case DatabaseAsync():
+                schema = rparam.DatabaseSchemaAsync(self)
 
-        return dbconfig
+        return schema
 
 
     @property
@@ -473,7 +435,7 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
 
 
     @property
-    def global_status(self):
+    def status_global(self):
         """
         Build global database parameters status instance.
 
@@ -505,7 +467,7 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
 
 
     @property
-    def global_variables(self):
+    def variables_global(self):
         """
         Build global database parameters variable instance.
 
@@ -522,13 +484,29 @@ class DatabaseSuper(rbase.DatabaseBase, Generic[rbase.EngineT, rbase.DatabaseCon
         return dbpv
 
 
-class Database(DatabaseSuper[Engine, 'rconn.DatabaseConnection', 'rexec.DatabaseExecute']):
+class Database(
+    DatabaseSuper[
+        Engine,
+        'rconn.DatabaseConnection',
+        'rexec.DatabaseExecute',
+        'rparam.DatabaseSchema',
+        'rorm.DatabaseORM'
+    ]
+):
     """
     Database type, based `MySQL`.
     """
 
 
-class DatabaseAsync(DatabaseSuper[AsyncEngine, 'rconn.DatabaseConnectionAsync', 'rexec.DatabaseExecuteAsync']):
+class DatabaseAsync(
+    DatabaseSuper[
+        AsyncEngine,
+        'rconn.DatabaseConnectionAsync',
+        'rexec.DatabaseExecuteAsync',
+        'rparam.DatabaseSchemaAsync',
+        'rorm.DatabaseORMAsync'
+    ]
+):
     """
     Asynchronous database type, based `MySQL`.
     """

reydb/rerror.py

@@ -37,7 +37,7 @@ class DatabaseError(DatabaseBase):
 
         Parameters
         ----------
-        db: `Database` instance.
+        db: Database instance.
         """
 
         # Build.

reydb/rexec.py

@@ -83,7 +83,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Returns
         -------
-        Parameters `sql` and `data` and `report`.
+        Parameter `sql` and `data` and `report`.
         """
 
         # Handle parameter.
@@ -136,7 +136,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Returns
         -------
-        Parameters `sql`.
+        Parameter `sql`.
         """
 
         # Generate SQL.
@@ -226,7 +226,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Returns
         -------
-        Parameters `sql` and `kwdata`.
+        Parameter `sql` and `kwdata`.
         """
 
         # Handle parameter.
@@ -363,7 +363,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Returns
         -------
-        Parameters `sql` and `data`.
+        Parameter `sql` and `data`.
         """
 
         # Handle parameter.
@@ -547,7 +547,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Returns
         -------
-        Parameters `sql`.
+        Parameter `sql`.
         """
 
         # Handle parameter.

reydb/rfile.py

@@ -38,7 +38,7 @@ class DatabaseFile(DatabaseBase):
 
         Parameters
         ----------
-        db: `Database` instance.
+        db: Database instance.
         """
 
         # Build.

reydb/rinfo.py

@@ -197,7 +197,7 @@ class DatabaseInformationSchema(DatabaseInformation):
 
         Parameters
         ----------
-        db: `Database` instance.
+        db: Database instance.
         """
 
         # Set parameter.
@@ -261,7 +261,7 @@ class DatabaseInformationDatabase(DatabaseInformation):
 
         Parameters
         ----------
-        db: `Database` instance.
+        db: Database instance.
         database : Database name.
         """
 
@@ -357,7 +357,7 @@ class DatabaseInformationTable(DatabaseInformation):
 
         Parameters
         ----------
-        db: `Database` instance.
+        db: Database instance.
         database : Database name.
         table : Table name.
         """
@@ -452,7 +452,7 @@ class DatabaseInformationColumn(DatabaseInformation):
 
         Parameters
         ----------
-        db: `Database` instance.
+        db: Database instance.
         database : Database name.
         table : Table name.
         column : Column name.