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

reydb/rconfig.py

@@ -20,6 +20,7 @@ from reykit.rbase import Null, throw
 
 from . import rdb
 from .rbase import DatabaseBase
+from .rorm import DatabaseORM as orm
 
 
 __all__ = (
@@ -41,85 +42,60 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
     Database config super type.
     Can create database used `self.build_db` method.
 
-    Examples
-    --------
-    >>> config = DatabaseConfig()
-    >>> config['key1'] = 1
-    >>> config['key2', 'note'] = 2
-    >>> config['key1'], config['key2']
-    (1, 2)
+    Attributes
+    ----------
+    db_names : Database table name mapping dictionary.
     """
 
+    db_names = {
+        'config': 'config',
+        'stats_config': 'stats_config'
+    }
 
-    def __init__(
-        self,
-        db: DatabaseT,
-        db_names: dict[str, str] | None = None
-    ) -> None:
+
+    def __init__(self, db: DatabaseT) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
         db: Database instance.
-        db_names: Update build database table names.
         """
 
         # Build.
         self.db = db
-        self.db_names = {
-            'config': 'config',
-            'stats_config': 'stats_config'
-        }
-        if db_names is not None:
-            self.db_names.update(db_names)
-
-
-class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
-    """
-    Database config type.
-    Can create database used `self.build_db` method.
-
-    Examples
-    --------
-    >>> config = DatabaseConfig()
-    >>> config['key1'] = 1
-    >>> config['key2', 'note'] = 2
-    >>> config['key1'], config['key2']
-    (1, 2)
-    """
 
 
-    def build_db(self) -> None:
+    def handle_build_db(self) -> None:
         """
-        Check and build database tables, by `self.db_names`.
+        Handle method of check and build database tables, by `self.db_names`.
         """
 
         # Handle parameter.
 
         ## Table.
-        class Config(self.db.orm.Model, table=True):
+        class Config(orm.Model, table=True):
             __name__ = self.db_names['config']
             __comment__ = '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: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), key=True, not_null=True, comment='Config key.')
-            value: str = self.db.orm.Field(type=self.db.orm.types.TEXT, not_null=True, comment='Config value.')
-            type: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), not_null=True, comment='Config value type.')
-            note: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(500), comment='Config note.')
+            create_time: Datetime = orm.Field(field_default='CURRENT_TIMESTAMP', not_null=True, index_n=True, comment='Config create time.')
+            update_time: Datetime = orm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config update time.')
+            key: str = orm.Field(field_type=orm.types.VARCHAR(50), key=True, not_null=True, comment='Config key.')
+            value: str = orm.Field(field_type=orm.types.TEXT, not_null=True, comment='Config value.')
+            type: str = orm.Field(field_type=orm.types.VARCHAR(50), not_null=True, comment='Config value type.')
+            note: str = orm.Field(field_type=orm.types.VARCHAR(500), comment='Config note.')
 
         tables = [Config]
 
         ## View stats.
         views_stats = [
             {
-                'path': (self.db.database, self.db_names['stats_config']),
+                'path': self.db_names['stats_config'],
                 'items': [
                     {
                         'name': 'count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db_names['config']}`'
+                            f'FROM `{self.db.database}`.`{self.db_names['config']}`'
                         ),
                         'comment': 'Config count.'
                     },
@@ -127,7 +103,7 @@ class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
                         'name': 'last_create_time',
                         'select': (
                             'SELECT MAX(`create_time`)\n'
-                            f'FROM `{self.db_names['config']}`'
+                            f'FROM `{self.db.database}`.`{self.db_names['config']}`'
                         ),
                         'comment': 'Config last record create time.'
                     },
@@ -135,15 +111,40 @@ class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
                         'name': 'last_update_time',
                         'select': (
                             'SELECT MAX(`update_time`)\n'
-                            f'FROM `{self.db_names['config']}`'
+                            f'FROM `{self.db.database}`.`{self.db_names['config']}`'
                         ),
                         'comment': 'Config last record update time.'
                     }
                 ]
             }
-
         ]
 
+        return tables, views_stats
+
+
+class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
+    """
+    Database config type.
+    Can create database used `self.build_db` method.
+
+    Examples
+    --------
+    >>> config = DatabaseConfig()
+    >>> config['key1'] = 1
+    >>> config['key2', 'note'] = 2
+    >>> config['key1'], config['key2']
+    (1, 2)
+    """
+
+
+    def build_db(self) -> None:
+        """
+        Check and build database tables, by `self.db_names`.
+        """
+
+        # Handle parameter.
+        tables, views_stats = self.handle_build_db()
+
         # Build.
         self.db.build.build(tables=tables, views_stats=views_stats, skip=True)
 
@@ -454,9 +455,9 @@ class DatabaseConfigAsync(DatabaseConfigSuper['rdb.DatabaseAsync']):
     Examples
     --------
     >>> config = DatabaseConfig()
-    >>> config['key1'] = 1
-    >>> config['key2', 'note'] = 2
-    >>> config['key1'], config['key2']
+    >>> await config['key1'] = 1
+    >>> await config['key2', 'note'] = 2
+    >>> await config['key1'], config['key2']
     (1, 2)
     """
 
@@ -467,53 +468,7 @@ class DatabaseConfigAsync(DatabaseConfigSuper['rdb.DatabaseAsync']):
         """
 
         # Handle parameter.
-
-        ## Table.
-        class Config(self.db.orm.Model, table=True):
-            __name__ = self.db_names['config']
-            __comment__ = '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: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), key=True, not_null=True, comment='Config key.')
-            value: str = self.db.orm.Field(type=self.db.orm.types.TEXT, not_null=True, comment='Config value.')
-            type: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), not_null=True, comment='Config value type.')
-            note: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(500), comment='Config note.')
-
-        tables = [Config]
-
-        ## View stats.
-        views_stats = [
-            {
-                'path': (self.db.database, self.db_names['stats_config']),
-                'items': [
-                    {
-                        'name': 'count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{self.db_names['config']}`'
-                        ),
-                        'comment': 'Config count.'
-                    },
-                    {
-                        'name': 'last_create_time',
-                        'select': (
-                            'SELECT MAX(`create_time`)\n'
-                            f'FROM `{self.db_names['config']}`'
-                        ),
-                        'comment': 'Config last record create time.'
-                    },
-                    {
-                        'name': 'last_update_time',
-                        'select': (
-                            'SELECT MAX(`update_time`)\n'
-                            f'FROM `{self.db_names['config']}`'
-                        ),
-                        'comment': 'Config last record update time.'
-                    }
-                ]
-            }
-
-        ]
+        tables, views_stats = self.handle_build_db()
 
         # Build.
         await self.db.build.build(tables=tables, views_stats=views_stats, skip=True)

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, rorm, rparam
+from . import rbase, rbuild, rconfig, rconn, rerror, rexec, rinfo, rorm
 
 
 __all__ = (
@@ -31,11 +31,31 @@ DatabaseExecuteT = TypeVar('DatabaseExecuteT', 'rexec.DatabaseExecute', 'rexec.D
 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')
+DatabaseInformationSchemaT = TypeVar(
+    'DatabaseInformationSchemaT',
+    'rinfo.DatabaseInformationSchema',
+    'rinfo.DatabaseInformationSchemaAsync'
+)
+DatabaseInformationParameterVariablesT = TypeVar(
+    'DatabaseInformationParameterVariablesT',
+    'rinfo.DatabaseInformationParameterVariables',
+    'rinfo.DatabaseInformationParameterVariablesAsync'
+)
+DatabaseInformationParameterStatusT = TypeVar(
+    'DatabaseInformationParameterStatusT',
+    'rinfo.DatabaseInformationParameterStatus',
+    'rinfo.DatabaseInformationParameterStatusAsync'
+)
+DatabaseInformationParameterVariablesGlobalT = TypeVar(
+    'DatabaseInformationParameterVariablesGlobalT',
+    'rinfo.DatabaseInformationParameterVariablesGlobal',
+    'rinfo.DatabaseInformationParameterVariablesGlobalAsync'
+)
+DatabaseInformationParameterStatusGlobalT = TypeVar(
+    'DatabaseInformationParameterStatusGlobalT',
+    'rinfo.DatabaseInformationParameterStatusGlobal',
+    'rinfo.DatabaseInformationParameterStatusGlobalAsync'
+)
 
 
 class DatabaseSuper(
@@ -47,11 +67,11 @@ class DatabaseSuper(
         DatabaseORMT,
         DatabaseBuildT,
         DatabaseConfigT,
-        DatabaseSchemaT,
-        DatabaseParametersVariablesT,
-        DatabaseParametersStatusT,
-        DatabaseParametersVariablesGlobalT,
-        DatabaseParametersStatusGlobalT
+        DatabaseInformationSchemaT,
+        DatabaseInformationParameterVariablesT,
+        DatabaseInformationParameterStatusT,
+        DatabaseInformationParameterVariablesGlobalT,
+        DatabaseInformationParameterStatusGlobalT
     ]
 ):
     """
@@ -70,7 +90,7 @@ class DatabaseSuper(
         max_overflow: int = 10,
         pool_timeout: float = 30.0,
         pool_recycle: int | None = 3600,
-        report: bool = False,
+        echo: bool = False,
         **query: str
     ) -> None:
         """
@@ -89,7 +109,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, not include ORM execute.
+        echo : Whether report SQL execute information, not include ORM execute.
         query : Remote server database parameters.
         """
 
@@ -110,9 +130,12 @@ class DatabaseSuper(
             self.pool_recycle = -1
         else:
             self.pool_recycle = pool_recycle
-        self.report = report
+        self.echo = echo
         self.query = query
 
+        ## Schema.
+        self._schema: dict[str, dict[str, list[str]]] | None = None
+
         ## Create engine.
         self.engine = self.__create_engine()
 
@@ -336,22 +359,6 @@ class DatabaseSuper(
         return build
 
 
-    @property
-    def file(self):
-        """
-        Build database file instance.
-
-        Returns
-        -------
-        Instance.
-        """
-
-        # Build.
-        dbfile = rfile.DatabaseFile(self)
-
-        return dbfile
-
-
     @property
     def error(self):
         """
@@ -363,9 +370,13 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbfile = rerror.DatabaseError(self)
+        match self:
+            case Database():
+                error = rerror.DatabaseError(self)
+            case DatabaseAsync():
+                error = rerror.DatabaseErrorAsync(self)
 
-        return dbfile
+        return error
 
 
     @property
@@ -389,7 +400,7 @@ class DatabaseSuper(
 
 
     @property
-    def schema(self) -> DatabaseSchemaT:
+    def schema(self) -> DatabaseInformationSchemaT:
         """
         Build database schema instance.
 
@@ -401,15 +412,15 @@ class DatabaseSuper(
         # Build.
         match self:
             case Database():
-                schema = rparam.DatabaseSchema(self)
+                schema = rinfo.DatabaseInformationSchema(self)
             case DatabaseAsync():
-                schema = rparam.DatabaseSchemaAsync(self)
+                schema = rinfo.DatabaseInformationSchemaAsync(self)
 
         return schema
 
 
     @property
-    def var(self) -> DatabaseParametersVariablesT:
+    def var(self) -> DatabaseInformationParameterVariablesT:
         """
         Build database parameters variable instance.
 
@@ -421,15 +432,15 @@ class DatabaseSuper(
         # Build.
         match self:
             case Database():
-                var = rparam.DatabaseParametersVariables(self)
+                var = rinfo.DatabaseInformationParameterVariables(self)
             case DatabaseAsync():
-                var = rparam.DatabaseParametersVariablesAsync(self)
+                var = rinfo.DatabaseInformationParameterVariablesAsync(self)
 
         return var
 
 
     @property
-    def stat(self) -> DatabaseParametersVariablesT:
+    def stat(self) -> DatabaseInformationParameterVariablesT:
         """
         Build database parameters status instance.
 
@@ -441,15 +452,15 @@ class DatabaseSuper(
         # Build.
         match self:
             case Database():
-                stat = rparam.DatabaseParametersStatus(self)
+                stat = rinfo.DatabaseInformationParameterStatus(self)
             case DatabaseAsync():
-                stat = rparam.DatabaseParametersStatusAsync(self)
+                stat = rinfo.DatabaseInformationParameterStatusAsync(self)
 
         return stat
 
 
     @property
-    def glob_var(self) -> DatabaseParametersVariablesGlobalT:
+    def glob_var(self) -> DatabaseInformationParameterVariablesGlobalT:
         """
         Build global database parameters variable instance.
 
@@ -461,15 +472,15 @@ class DatabaseSuper(
         # Build.
         match self:
             case Database():
-                var = rparam.DatabaseParametersVariablesGlobal(self)
+                var = rinfo.DatabaseInformationParameterVariablesGlobal(self)
             case DatabaseAsync():
-                var = rparam.DatabaseParametersVariablesGlobalAsync(self)
+                var = rinfo.DatabaseInformationParameterVariablesGlobalAsync(self)
 
         return var
 
 
     @property
-    def glob_stat(self) -> DatabaseParametersStatusGlobalT:
+    def glob_stat(self) -> DatabaseInformationParameterStatusGlobalT:
         """
         Build global database parameters status instance.
 
@@ -481,9 +492,9 @@ class DatabaseSuper(
         # Build.
         match self:
             case Database():
-                stat = rparam.DatabaseParametersStatusGlobal(self)
+                stat = rinfo.DatabaseInformationParameterStatusGlobal(self)
             case DatabaseAsync():
-                stat = rparam.DatabaseParametersStatusGlobalAsync(self)
+                stat = rinfo.DatabaseInformationParameterStatusGlobalAsync(self)
 
         return stat
 
@@ -496,11 +507,11 @@ class Database(
         'rorm.DatabaseORM',
         'rbuild.DatabaseBuild',
         'rconfig.DatabaseConfig',
-        'rparam.DatabaseSchema',
-        'rparam.DatabaseParametersVariables',
-        'rparam.DatabaseParametersStatus',
-        'rparam.DatabaseParametersVariablesGlobal',
-        'rparam.DatabaseParametersStatusGlobal'
+        'rinfo.DatabaseInformationSchema',
+        'rinfo.DatabaseInformationParameterVariables',
+        'rinfo.DatabaseInformationParameterStatus',
+        'rinfo.DatabaseInformationParameterVariablesGlobal',
+        'rinfo.DatabaseInformationParameterStatusGlobal'
     ]
 ):
     """
@@ -516,11 +527,11 @@ class DatabaseAsync(
         'rorm.DatabaseORMAsync',
         'rbuild.DatabaseBuildAsync',
         'rconfig.DatabaseConfigAsync',
-        'rparam.DatabaseSchemaAsync',
-        'rparam.DatabaseParametersVariablesAsync',
-        'rparam.DatabaseParametersStatusAsync',
-        'rparam.DatabaseParametersVariablesGlobalAsync',
-        'rparam.DatabaseParametersStatusGlobalAsync'
+        'rinfo.DatabaseInformationSchemaAsync',
+        'rinfo.DatabaseInformationParameterVariablesAsync',
+        'rinfo.DatabaseInformationParameterStatusAsync',
+        'rinfo.DatabaseInformationParameterVariablesGlobalAsync',
+        'rinfo.DatabaseInformationParameterStatusGlobalAsync'
     ]
 ):
     """