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

reydb/rconfig.py

@@ -49,109 +49,54 @@ class DatabaseConfig(DatabaseBase):
     """
 
 
-    def __init__(self, db: 'rdb.Database') -> None:
+    def __init__(
+        self,
+        db: 'rdb.Database',
+        db_names: dict[str, str] | None = None
+    ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
         db: Database instance.
+        db_names: Update build database table names.
         """
 
         # Build.
         self.db = db
-
-        ## Database path name.
         self.db_names = {
-            'base': 'base',
-            'base.config': 'config',
-            'base.stats_config': 'stats_config'
+            'config': 'config',
+            'stats_config': 'stats_config'
         }
+        if db_names is not None:
+            self.db_names.update(db_names)
 
 
     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.
-
-        ## Database.
-        databases = [
-            {
-                'name': self.db_names['base']
-            }
-        ]
+        # Handle parameter.
 
         ## Table.
-        tables = [
-
-            ### 'config'.
-            {
-                'path': (self.db_names['base'], self.db_names['base.config']),
-                'fields': [
-                    {
-                        'name': 'create_time',
-                        'type': 'datetime',
-                        'constraint': 'NOT NULL DEFAULT CURRENT_TIMESTAMP',
-                        'comment': 'Config create time.'
-                    },
-                    {
-                        'name': 'update_time',
-                        'type': 'datetime',
-                        'constraint': 'DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP',
-                        'comment': 'Config update time.'
-                    },
-                    {
-                        'name': 'key',
-                        'type': 'varchar(50)',
-                        'constraint': 'NOT NULL',
-                        'comment': 'Config key.'
-                    },
-                    {
-                        'name': 'value',
-                        'type': 'text',
-                        'constraint': 'NOT NULL',
-                        'comment': 'Config value.'
-                    },
-                    {
-                        'name': 'type',
-                        'type': 'varchar(50)',
-                        'constraint': 'NOT NULL',
-                        'comment': 'Config value type.'
-                    },
-                    {
-                        'name': 'note',
-                        'type': 'varchar(500)',
-                        'comment': 'Config note.'
-                    }
-                ],
-                'primary': 'key',
-                'indexes': [
-                    {
-                        'name': 'n_create_time',
-                        'fields': 'create_time',
-                        'type': 'noraml',
-                        'comment': 'Config create time normal index.'
-                    },
-                    {
-                        'name': 'n_update_time',
-                        'fields': 'update_time',
-                        'type': 'noraml',
-                        'comment': 'Config update time normal index.'
-                    }
-                ],
-                'comment': 'Config data table.'
-            }
-
-        ]
+        class Config(self.db.orm.Model, table=True):
+            __name__ = self.db_names['config']
+            __commment__ = 'Config data table.'
+            create_time: datetime = self.db.orm.Field(not_null=True, field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config create time.')
+            update_time: datetime = self.db.orm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config update time.')
+            key = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), key=True, not_null=True, comment='Config key.')
+            value = self.db.orm.Field(type=self.db.orm.types.TEXT, not_null=True, comment='Config value.')
+            type = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), not_null=True, comment='Config value type.')
+            note = self.db.orm.Field(type=self.db.orm.types.VARCHAR(500), comment='Config note.')
+
+        tables = [Config]
 
         ## View stats.
         views_stats = [
-
-            ### 'stats_config'.
             {
-                'path': (self.db_names['base'], self.db_names['base.stats_config']),
+                'path': self.db_names['stats_config'],
                 'items': [
                     {
                         'name': 'count',
@@ -178,13 +123,12 @@ class DatabaseConfig(DatabaseBase):
                         'comment': 'Config last record update time.'
                     }
                 ]
-
             }
 
         ]
 
         # Build.
-        self.db.build.build(databases, tables, views_stats=views_stats)
+        self.db.build.build(tables=tables, views_stats=views_stats)
 
 
     @property
@@ -199,7 +143,7 @@ class DatabaseConfig(DatabaseBase):
 
         # Get.
         result = self.db.execute.select(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['config'],
             ['key', 'value', 'type', 'note'],
             order='IFNULL(`update_time`, `create_time`) DESC'
         )
@@ -235,7 +179,7 @@ class DatabaseConfig(DatabaseBase):
         # Get.
         where = '`key` = :key'
         result = self.db.execute.select(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['config'],
             '`value`',
             where,
             limit=1,
@@ -281,7 +225,7 @@ class DatabaseConfig(DatabaseBase):
             'note': default_note
         }
         result = self.db.execute.insert(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['config'],
             data,
             'ignore'
         )
@@ -322,7 +266,7 @@ class DatabaseConfig(DatabaseBase):
 
         # Update.
         self.db.execute.insert(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['config'],
             data,
             'update'
         )
@@ -345,7 +289,7 @@ class DatabaseConfig(DatabaseBase):
             where = '`key` in :key'
             limit = None
         result = self.db.execute.delete(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['base.config'],
             where,
             limit=limit,
             key=key
@@ -367,7 +311,7 @@ class DatabaseConfig(DatabaseBase):
 
         # Get.
         result = self.db.execute.select(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['config'],
             ['key', 'value']
         )
 
@@ -393,7 +337,7 @@ class DatabaseConfig(DatabaseBase):
 
         # Get.
         result = self.db.execute.select(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['config'],
             '`key`'
         )
 
@@ -418,7 +362,7 @@ class DatabaseConfig(DatabaseBase):
 
         # Get.
         result = self.db.execute.select(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['config'],
             '`value`'
         )
 
@@ -480,7 +424,7 @@ class DatabaseConfig(DatabaseBase):
             'note': note
         }
         self.db.execute.insert(
-            (self.db_names['base'], self.db_names['base.config']),
+            self.db_names['config'],
             data,
             'update'
         )

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]):
@@ -63,6 +67,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.
@@ -73,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:
@@ -89,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:
@@ -102,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:
@@ -113,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:
@@ -124,17 +161,40 @@ 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 __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 +204,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 +219,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
         -------
@@ -198,15 +236,15 @@ 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:
         """
-        Asynchronous get `Transaction` instance.
+        Asynchronous get `AsyncTransaction` instance.
 
         Returns
         -------
@@ -214,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:
@@ -227,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:
@@ -238,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:
@@ -249,46 +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
-
-
-    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()
+        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: