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

reydb/rconn.py

@@ -9,12 +9,12 @@
 """
 
 
-from typing import Self, Generic
+from typing import Self, TypeVar, Generic
 from sqlalchemy import Connection, Transaction
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncTransaction
 
 from . import rdb, rexec
-from .rbase import DatabaseT, DatabaseExecuteT, ConnectionT, TransactionT, DatabaseBase
+from .rbase import ConnectionT, TransactionT, DatabaseBase
 
 
 __all__ = (
@@ -24,6 +24,10 @@ __all__ = (
 )
 
 
+DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
+DatabaseExecuteT = TypeVar('DatabaseExecuteT', 'rexec.DatabaseExecute', 'rexec.DatabaseExecuteAsync')
+
+
 class DatabaseConnectionSuper(DatabaseBase, Generic[DatabaseT, DatabaseExecuteT, ConnectionT, TransactionT]):
     """
     Database connection super type.
@@ -53,8 +57,8 @@ class DatabaseConnectionSuper(DatabaseBase, Generic[DatabaseT, DatabaseExecuteT,
             case rdb.DatabaseAsync():
                 exec = rexec.DatabaseExecuteAsync(self)
         self.execute: DatabaseExecuteT = exec
-        self.conn: ConnectionT | None = None
-        self.begin: TransactionT | None = None
+        self.connection: ConnectionT | None = None
+        self.transaction: TransactionT | None = None
 
 
 class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.DatabaseExecute', Connection, Transaction]):
@@ -106,10 +110,10 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
         """
 
         # Create.
-        if self.conn is None:
-            self.conn = self.db.engine.connect()
+        if self.connection is None:
+            self.connection = self.db.engine.connect()
 
-        return self.conn
+        return self.connection
 
 
     def get_begin(self) -> Transaction:
@@ -122,11 +126,11 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
         """
 
         # Create.
-        if self.begin is None:
+        if self.transaction is None:
             conn = self.get_conn()
-            self.begin = conn.begin()
+            self.transaction = conn.begin()
 
-        return self.begin
+        return self.transaction
 
 
     def commit(self) -> None:
@@ -135,9 +139,9 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
         """
 
         # Commit.
-        if self.begin is not None:
-            self.begin.commit()
-            self.begin = None
+        if self.transaction is not None:
+            self.transaction.commit()
+            self.transaction = None
 
 
     def rollback(self) -> None:
@@ -146,9 +150,9 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
         """
 
         # Rollback.
-        if self.begin is not None:
-            self.begin.rollback()
-            self.begin = None
+        if self.transaction is not None:
+            self.transaction.rollback()
+            self.transaction = None
 
 
     def close(self) -> None:
@@ -157,12 +161,12 @@ class DatabaseConnection(DatabaseConnectionSuper['rdb.Database', 'rexec.Database
         """
 
         # Close.
-        if self.begin is not None:
-            self.begin.close()
-            self.begin = None
-        if self.conn is not None:
-            self.conn.close()
-            self.conn = None
+        if self.transaction is not None:
+            self.transaction.close()
+            self.transaction = None
+        if self.connection is not None:
+            self.connection.close()
+            self.connection = None
 
 
     def insert_id(self) -> int:
@@ -232,10 +236,10 @@ class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexe
         """
 
         # Create.
-        if self.conn is None:
-            self.conn = await self.db.engine.connect()
+        if self.connection is None:
+            self.connection = await self.db.engine.connect()
 
-        return self.conn
+        return self.connection
 
 
     async def get_begin(self) -> AsyncTransaction:
@@ -248,11 +252,11 @@ class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexe
         """
 
         # Create.
-        if self.begin is None:
+        if self.transaction is None:
             conn = await self.get_conn()
-            self.begin = await conn.begin()
+            self.transaction = await conn.begin()
 
-        return self.begin
+        return self.transaction
 
 
     async def commit(self) -> None:
@@ -261,9 +265,9 @@ class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexe
         """
 
         # Commit.
-        if self.begin is not None:
-            await self.begin.commit()
-            self.begin = None
+        if self.transaction is not None:
+            await self.transaction.commit()
+            self.transaction = None
 
 
     async def rollback(self) -> None:
@@ -272,9 +276,9 @@ class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexe
         """
 
         # Rollback.
-        if self.begin is not None:
-            await self.begin.rollback()
-            self.begin = None
+        if self.transaction is not None:
+            await self.transaction.rollback()
+            self.transaction = None
 
 
     async def close(self) -> None:
@@ -283,12 +287,12 @@ class DatabaseConnectionAsync(DatabaseConnectionSuper['rdb.DatabaseAsync', 'rexe
         """
 
         # Close.
-        if self.begin is not None:
-            await self.begin.close()
-            self.begin = None
-        if self.conn is not None:
-            await self.conn.close()
-            self.conn = None
+        if self.transaction is not None:
+            await self.transaction.close()
+            self.transaction = None
+        if self.connection is not None:
+            await self.connection.close()
+            self.connection = None
 
 
     async def insert_id(self) -> int:

reydb/rdb.py

@@ -16,7 +16,7 @@ from sqlalchemy import Engine, create_engine as sqlalchemy_create_engine
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine as sqlalchemy_create_async_engine
 from reykit.rtext import join_data_text
 
-from . import rbase, rbuild, rconfig, rconn, rerror, rexec, rfile, rinfo, rorm, rparam
+from . import rbase, rbuild, rconfig, rconn, rerror, rexec, rfile, rorm, rparam
 
 
 __all__ = (
@@ -26,14 +26,32 @@ __all__ = (
 )
 
 
+DatabaseConnectionT = TypeVar('DatabaseConnectionT', 'rconn.DatabaseConnection', 'rconn.DatabaseConnectionAsync')
+DatabaseExecuteT = TypeVar('DatabaseExecuteT', 'rexec.DatabaseExecute', 'rexec.DatabaseExecuteAsync')
+DatabaseORMT = TypeVar('DatabaseORMT', 'rorm.DatabaseORM', 'rorm.DatabaseORMAsync')
+DatabaseBuildT = TypeVar('DatabaseBuildT', 'rbuild.DatabaseBuild', 'rbuild.DatabaseBuildAsync')
+DatabaseConfigT = TypeVar('DatabaseConfigT', 'rconfig.DatabaseConfig', 'rconfig.DatabaseConfigAsync')
+DatabaseSchemaT = TypeVar('DatabaseSchemaT', 'rparam.DatabaseSchema', 'rparam.DatabaseSchemaAsync')
+DatabaseParametersVariablesT = TypeVar('DatabaseParametersVariablesT', 'rparam.DatabaseParametersVariables', 'rparam.DatabaseParametersVariablesAsync')
+DatabaseParametersStatusT = TypeVar('DatabaseParametersStatusT', 'rparam.DatabaseParametersStatus', 'rparam.DatabaseParametersStatusAsync')
+DatabaseParametersVariablesGlobalT = TypeVar('DatabaseParametersVariablesGlobalT', 'rparam.DatabaseParametersVariablesGlobal', 'rparam.DatabaseParametersVariablesGlobalAsync')
+DatabaseParametersStatusGlobalT = TypeVar('DatabaseParametersStatusGlobalT', 'rparam.DatabaseParametersStatusGlobal', 'rparam.DatabaseParametersStatusGlobalAsync')
+
+
 class DatabaseSuper(
     rbase.DatabaseBase,
     Generic[
         rbase.EngineT,
-        rbase.DatabaseConnectionT,
-        rbase.DatabaseExecuteT,
-        rbase.DatabaseSchemaT,
-        rbase.DatabaseORMT
+        DatabaseConnectionT,
+        DatabaseExecuteT,
+        DatabaseORMT,
+        DatabaseBuildT,
+        DatabaseConfigT,
+        DatabaseSchemaT,
+        DatabaseParametersVariablesT,
+        DatabaseParametersStatusT,
+        DatabaseParametersVariablesGlobalT,
+        DatabaseParametersStatusGlobalT
     ]
 ):
     """
@@ -71,7 +89,7 @@ class DatabaseSuper(
         pool_recycle : Number of seconds `recycle` connection.
             - `None | Literal[-1]`: No recycle.
             - `int`: Use this value.
-        report : Whether report SQL execute information.
+        report : Whether report SQL execute information, not include ORM execute.
         query : Remote server database parameters.
         """
 
@@ -238,7 +256,7 @@ class DatabaseSuper(
         return keep_n, overflow_n
 
 
-    def connect(self, autocommit: bool = False) -> rbase.DatabaseConnectionT:
+    def connect(self, autocommit: bool = False) -> DatabaseConnectionT:
         """
         Build database connection instance.
 
@@ -262,7 +280,7 @@ class DatabaseSuper(
 
 
     @property
-    def execute(self) -> rbase.DatabaseExecuteT:
+    def execute(self) -> DatabaseExecuteT:
         """
         Build database execute instance.
 
@@ -279,7 +297,7 @@ class DatabaseSuper(
 
 
     @property
-    def orm(self) -> 'rbase.DatabaseORMT':
+    def orm(self) -> DatabaseORMT:
         """
         Build database ORM instance.
 
@@ -299,7 +317,7 @@ class DatabaseSuper(
 
 
     @property
-    def build(self):
+    def build(self) -> DatabaseBuildT:
         """
         Build database build instance.
 
@@ -309,9 +327,13 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbbuild = rbuild.DatabaseBuild(self)
+        match self:
+            case Database():
+                build = rbuild.DatabaseBuild(self)
+            case DatabaseAsync():
+                build = rbuild.DatabaseBuildAsync(self)
 
-        return dbbuild
+        return build
 
 
     @property
@@ -347,7 +369,7 @@ class DatabaseSuper(
 
 
     @property
-    def config(self):
+    def config(self) -> DatabaseConfigT:
         """
         Build database config instance.
 
@@ -357,49 +379,17 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbconfig = rconfig.DatabaseConfig(self)
-
-        return dbconfig
-
-
-    @property
-    def info(self):
-        """
-        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.
-        dbischema = rinfo.DatabaseInformationSchema(self)
+        match self:
+            case Database():
+                config = rconfig.DatabaseConfig(self)
+            case DatabaseAsync():
+                config = rconfig.DatabaseConfigAsync(self)
 
-        return dbischema
+        return config
 
 
     @property
-    def schema(self) -> rbase.DatabaseSchemaT:
+    def schema(self) -> DatabaseSchemaT:
         """
         Build database schema instance.
 
@@ -419,9 +409,9 @@ class DatabaseSuper(
 
 
     @property
-    def status(self):
+    def var(self) -> DatabaseParametersVariablesT:
         """
-        Build database parameters status instance.
+        Build database parameters variable instance.
 
         Returns
         -------
@@ -429,15 +419,19 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbps = rparam.DatabaseParametersStatus(self, False)
+        match self:
+            case Database():
+                var = rparam.DatabaseParametersVariables(self)
+            case DatabaseAsync():
+                var = rparam.DatabaseParametersVariablesAsync(self)
 
-        return dbps
+        return var
 
 
     @property
-    def status_global(self):
+    def stat(self) -> DatabaseParametersVariablesT:
         """
-        Build global database parameters status instance.
+        Build database parameters status instance.
 
         Returns
         -------
@@ -445,15 +439,19 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbps = rparam.DatabaseParametersStatus(self, True)
+        match self:
+            case Database():
+                stat = rparam.DatabaseParametersStatus(self)
+            case DatabaseAsync():
+                stat = rparam.DatabaseParametersStatusAsync(self)
 
-        return dbps
+        return stat
 
 
     @property
-    def variables(self):
+    def glob_var(self) -> DatabaseParametersVariablesGlobalT:
         """
-        Build database parameters variable instance.
+        Build global database parameters variable instance.
 
         Returns
         -------
@@ -461,15 +459,19 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbpv = rparam.DatabaseParametersVariable(self, False)
+        match self:
+            case Database():
+                var = rparam.DatabaseParametersVariablesGlobal(self)
+            case DatabaseAsync():
+                var = rparam.DatabaseParametersVariablesGlobalAsync(self)
 
-        return dbpv
+        return var
 
 
     @property
-    def variables_global(self):
+    def glob_stat(self) -> DatabaseParametersStatusGlobalT:
         """
-        Build global database parameters variable instance.
+        Build global database parameters status instance.
 
         Returns
         -------
@@ -477,11 +479,13 @@ class DatabaseSuper(
         """
 
         # Build.
+        match self:
+            case Database():
+                stat = rparam.DatabaseParametersStatusGlobal(self)
+            case DatabaseAsync():
+                stat = rparam.DatabaseParametersStatusGlobalAsync(self)
 
-        ## SQLite.
-        dbpv = rparam.DatabaseParametersVariable(self, True)
-
-        return dbpv
+        return stat
 
 
 class Database(
@@ -489,8 +493,14 @@ class Database(
         Engine,
         'rconn.DatabaseConnection',
         'rexec.DatabaseExecute',
+        'rorm.DatabaseORM',
+        'rbuild.DatabaseBuild',
+        'rconfig.DatabaseConfig',
         'rparam.DatabaseSchema',
-        'rorm.DatabaseORM'
+        'rparam.DatabaseParametersVariables',
+        'rparam.DatabaseParametersStatus',
+        'rparam.DatabaseParametersVariablesGlobal',
+        'rparam.DatabaseParametersStatusGlobal'
     ]
 ):
     """
@@ -503,8 +513,14 @@ class DatabaseAsync(
         AsyncEngine,
         'rconn.DatabaseConnectionAsync',
         'rexec.DatabaseExecuteAsync',
+        'rorm.DatabaseORMAsync',
+        'rbuild.DatabaseBuildAsync',
+        'rconfig.DatabaseConfigAsync',
         'rparam.DatabaseSchemaAsync',
-        'rorm.DatabaseORMAsync'
+        'rparam.DatabaseParametersVariablesAsync',
+        'rparam.DatabaseParametersStatusAsync',
+        'rparam.DatabaseParametersVariablesGlobalAsync',
+        'rparam.DatabaseParametersStatusGlobalAsync'
     ]
 ):
     """

reydb/rerror.py

@@ -53,7 +53,7 @@ class DatabaseError(DatabaseBase):
 
     def build_db(self) -> None:
         """
-        Check and build all standard databases and tables, by `self.db_names`.
+        Check and build database tables, by `self.db_names`.
         """
 
         # Set parameter.
@@ -223,7 +223,7 @@ class DatabaseError(DatabaseBase):
 
         # Insert.
         self.db.execute.insert(
-            (self.db_names['base'], self.db_names['base.error']),
+            self.db_names['base.error'],
             data=data
         )