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

reydb/rconfig.py

@@ -9,7 +9,7 @@
 """
 
 
-from typing import TypedDict, TypeVar, Generic
+from typing import Any, TypedDict, TypeVar, Generic
 from datetime import (
     datetime as Datetime,
     date as Date,
@@ -19,8 +19,8 @@ from datetime import (
 from reykit.rbase import Null, throw
 
 from . import rdb
+from . import rorm
 from .rbase import DatabaseBase
-from .rorm import DatabaseORM as orm
 
 
 __all__ = (
@@ -45,6 +45,7 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
     Attributes
     ----------
     db_names : Database table name mapping dictionary.
+    Config : Database `config` table model.
     """
 
     db_names = {
@@ -53,6 +54,16 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
     }
 
 
+    class Config(rorm.Model, table=True):
+        __comment__ = 'Config data table.'
+        create_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', not_null=True, index_n=True, comment='Config create time.')
+        update_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config update time.')
+        key: str = rorm.Field(field_type=rorm.types.VARCHAR(50), key=True, comment='Config key.')
+        value: str = rorm.Field(field_type=rorm.types.TEXT, not_null=True, comment='Config value.')
+        type: str = rorm.Field(field_type=rorm.types.VARCHAR(50), not_null=True, comment='Config value type.')
+        note: str = rorm.Field(field_type=rorm.types.VARCHAR(500), comment='Config note.')
+
+
     def __init__(self, db: DatabaseT) -> None:
         """
         Build instance attributes.
@@ -66,25 +77,20 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-    def handle_build_db(self) -> None:
+    def handle_build_db(self) -> tuple[list[type[Config]], list[dict[str, Any]]] :
         """
         Handle method of check and build database tables, by `self.db_names`.
+
+        Returns
+        -------
+        Build database parameter.
         """
 
-        # Handle parameter.
+        # Set parameter.
+        self.Config._name(self.db_names['config'])
 
         ## Table.
-        class Config(orm.Model, table=True):
-            __name__ = self.db_names['config']
-            __comment__ = 'Config data table.'
-            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]
+        tables = [self.Config]
 
         ## View stats.
         views_stats = [
@@ -142,7 +148,7 @@ class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
         Check and build database tables, by `self.db_names`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         tables, views_stats = self.handle_build_db()
 
         # Build.
@@ -265,7 +271,7 @@ class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
             - `ConfigTable`: Config key and value and note.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(data) == dict:
             data = [
                 {
@@ -426,7 +432,7 @@ class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
         value : Config value.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(key_note) != str:
             key, note = key_note
         else:
@@ -467,7 +473,7 @@ class DatabaseConfigAsync(DatabaseConfigSuper['rdb.DatabaseAsync']):
         Asynchronous check and build database tables, by `self.db_names`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         tables, views_stats = self.handle_build_db()
 
         # Build.
@@ -590,7 +596,7 @@ class DatabaseConfigAsync(DatabaseConfigSuper['rdb.DatabaseAsync']):
             - `ConfigTable`: Config key and value and note.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(data) == dict:
             data = [
                 {
@@ -751,7 +757,7 @@ class DatabaseConfigAsync(DatabaseConfigSuper['rdb.DatabaseAsync']):
         value : Config value.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(key_note) != str:
             key, note = key_note
         else:

reydb/rdb.py

@@ -113,7 +113,7 @@ class DatabaseSuper(
         query : Remote server database parameters.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(port) == str:
             port = int(port)
 
@@ -237,7 +237,7 @@ class DatabaseSuper(
         Engine object.
         """
 
-        # Handle parameter.
+        # Set parameter.
         engine_params = {
             'url': self.url,
             'pool_size': self.pool_size,

reydb/rerror.py

@@ -14,12 +14,11 @@ from collections.abc import Callable
 from inspect import iscoroutinefunction
 from traceback import StackSummary
 from functools import wraps as functools_wraps
-from datetime import datetime as Datetime
 from reykit.rbase import T, Exit, catch_exc
 
 from . import rdb
+from . import rorm
 from .rbase import DatabaseBase
-from .rorm import DatabaseORM as orm
 
 
 __all__ = (
@@ -40,6 +39,7 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
     Attributes
     ----------
     db_names : Database table name mapping dictionary.
+    Error : Database `error` table model.
     """
 
     db_names = {
@@ -48,6 +48,16 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
     }
 
 
+    class Error(rorm.Model, table=True):
+        __comment__ = 'Error log table.'
+        create_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', not_null=True, index_n=True, comment='Record create time.')
+        id: int = rorm.Field(field_type=rorm.types_mysql.INTEGER(unsigned=True), key_auto=True, comment='ID.')
+        type: str = rorm.Field(field_type=rorm.types.VARCHAR(50), not_null=True, index_n=True, comment='Error type.')
+        data: str = rorm.Field(field_type=rorm.types.JSON, comment='Error data.')
+        stack: str = rorm.Field(field_type=rorm.types.JSON, comment='Error code traceback stack.')
+        note: str = rorm.Field(field_type=rorm.types.VARCHAR(500), comment='Error note.')
+
+
     def __init__(self, db: DatabaseT) -> None:
         """
         Build instance attributes.
@@ -61,24 +71,20 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-    def handle_build_db(self) -> None:
+    def handle_build_db(self) -> tuple[list[type[Error]], list[dict[str, Any]]]:
         """
         Handle method of check and build database tables, by `self.db_names`.
+
+        Returns
+        -------
+        Build database parameter.
         """
 
-        # Handle parameter.
+        # Set parameter.
+        self.Error._name(self.db_names['error'])
 
         ## Table.
-        class error(orm.Model, table=True):
-            __name__ = self.db_names['error']
-            __comment__ = 'Error log table.'
-            create_time: Datetime = orm.Field(field_default='CURRENT_TIMESTAMP', not_null=True, index_n=True, comment='Record create time.')
-            id: int = orm.Field(field_name='idd', field_type=orm.types_mysql.INTEGER(unsigned=True), key=True, key_auto=True, not_null=True, comment='ID.')
-            type: str = orm.Field(field_type=orm.types.VARCHAR(50), not_null=True, index_n=True, comment='Error type.')
-            data: str = orm.Field(field_type=orm.types.JSON, comment='Error data.')
-            stack: str = orm.Field(field_type=orm.types.JSON, comment='Error code traceback stack.')
-            note: str = orm.Field(field_type=orm.types.VARCHAR(500), comment='Error note.')
-        tables = [error]
+        tables = [self.Error]
 
         ## View stats.
         views_stats = [
@@ -151,7 +157,7 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         note : Exception note.
         """
 
-        # Handle parameter.
+        # Set parameter.
         exc_type = type(exc).__name__
         exc_data = list(exc.args) or None
         exc_stack = [
@@ -185,7 +191,7 @@ class DatabaseError(DatabaseErrorSuper['rdb.Database']):
         Check and build database tables, by `self.db_names`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         tables, views_stats = self.handle_build_db()
 
         # Build.
@@ -208,7 +214,7 @@ class DatabaseError(DatabaseErrorSuper['rdb.Database']):
         note : Exception note.
         """
 
-        # Handle parameter.
+        # Set parameter.
         data = self.handle_record(exc, stack, note)
 
         # Insert.
@@ -235,7 +241,7 @@ class DatabaseError(DatabaseErrorSuper['rdb.Database']):
         filter_type : Exception types of not insert, but still throw exception.
         """
 
-        # Handle parameter.
+        # Set parameter.
         _, exc, stack = catch_exc()
 
         # Filter.
@@ -293,7 +299,7 @@ class DatabaseError(DatabaseErrorSuper['rdb.Database']):
         >>> func(*args, **kwargs)
         """
 
-        # Handle parameter.
+        # Set parameter.
         if issubclass(filter_type, BaseException):
             filter_type = (filter_type,)
 
@@ -363,7 +369,7 @@ class DatabaseErrorAsync(DatabaseErrorSuper['rdb.DatabaseAsync']):
         Asynchrouous check and build database tables, by `self.db_names`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         tables, views_stats = self.handle_build_db()
 
         # Build.
@@ -386,7 +392,7 @@ class DatabaseErrorAsync(DatabaseErrorSuper['rdb.DatabaseAsync']):
         note : Exception note.
         """
 
-        # Handle parameter.
+        # Set parameter.
         data = self.handle_record(exc, stack, note)
 
         # Insert.
@@ -413,7 +419,7 @@ class DatabaseErrorAsync(DatabaseErrorSuper['rdb.DatabaseAsync']):
         filter_type : Exception types of not insert, but still throw exception.
         """
 
-        # Handle parameter.
+        # Set parameter.
         _, exc, stack = catch_exc()
 
         # Filter.
@@ -472,7 +478,7 @@ class DatabaseErrorAsync(DatabaseErrorSuper['rdb.DatabaseAsync']):
         >>> await func(*args, **kwargs)
         """
 
-        # Handle parameter.
+        # Set parameter.
         if issubclass(filter_type, BaseException):
             filter_type = (filter_type,)
 

reydb/rexec.py

@@ -87,7 +87,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameter `sql` and `data` and `report`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         echo = get_first_notnone(echo, self.conn.db.echo)
         sql = handle_sql(sql)
         if data is None:
@@ -142,7 +142,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameter `sql`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(path) == str:
             database, table = self.conn.db.database, path
         else:
@@ -240,7 +240,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameter `sql` and `kwdata`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(path) == str:
             database, table = self.conn.db.database, path
         else:
@@ -383,7 +383,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameter `sql` and `data`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(path) == str:
             database, table = self.conn.db.database, path
         else:
@@ -517,7 +517,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameter `sql`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(path) == str:
             database, table = self.conn.db.database, path
         else:
@@ -580,7 +580,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameter `sql`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if type(path) == str:
             database, table = self.conn.db.database, path
         else:
@@ -658,7 +658,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         Result object.
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql, data, echo = self.handle_execute(sql, data, echo, **kwdata)
 
         # Transaction.
@@ -755,7 +755,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         [{'id': 1, 'id_': 2}, ...]
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql = self.handle_select(path, fields, where, group, having, order, limit)
 
         # Execute SQL.
@@ -808,7 +808,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         [{'key': 'a', 'value1': 1, 'value2': 2}, {'key': 'b', 'value1': 1, 'value2': 2}]
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql, kwdata = self.handle_insert(path, data, duplicate, **kwdata)
 
         # Execute SQL.
@@ -867,7 +867,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         [{'key': 'a', 'value': 1, 'name': 'a'}, {'key': 'b', 'value': 1, 'name': 'b'}]
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql, data = self.handle_update(path, data, where_fields, **kwdata)
 
         # Execute SQL.
@@ -913,7 +913,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         2
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql = self.handle_delete(path, where, order, limit)
 
         # Execute SQL.
@@ -964,7 +964,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         2
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql = self.handle_copy(path, fields, where, limit)
 
         # Execute SQL.
@@ -1145,7 +1145,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
             - When parameters `precision` is `greater than 0`, then return float.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if len(thresholds) == 1:
             second = thresholds[0]
         else:
@@ -1187,7 +1187,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         Result object.
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql, data, echo = self.handle_execute(sql, data, echo, **kwdata)
 
         # Transaction.
@@ -1301,7 +1301,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         [{'id': 1, 'id_': 2}, ...]
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql = self.handle_select(path, fields, where, group, having, order, limit)
 
         # Execute SQL.
@@ -1354,7 +1354,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         [{'key': 'a', 'value1': 1, 'value2': 2}, {'key': 'b', 'value1': 1, 'value2': 2}]
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql, kwdata = self.handle_insert(path, data, duplicate, **kwdata)
 
         # Execute SQL.
@@ -1413,7 +1413,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         [{'key': 'a', 'value': 1, 'name': 'a'}, {'key': 'b', 'value': 1, 'name': 'b'}]
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql, data = self.handle_update(path, data, where_fields, **kwdata)
 
         # Execute SQL.
@@ -1459,7 +1459,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         2
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql = self.handle_delete(path, where, order, limit)
 
         # Execute SQL.
@@ -1510,7 +1510,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         2
         """
 
-        # Handle parameter.
+        # Set parameter.
         sql = self.handle_copy(path, fields, where, limit)
 
         # Execute SQL.
@@ -1689,7 +1689,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
             - When parameters `precision` is `greater than 0`, then return float.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if len(thresholds) == 1:
             second = thresholds[0]
         else:

reydb/rinfo.py

@@ -75,7 +75,7 @@ class DatabaseInformationSchemaSuper(DatabaseInformationBase, Generic[DatabaseT]
         Parameter `sql` and `filter_db`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         filter_db = (
             'information_schema',
             'performance_schema',
@@ -193,7 +193,7 @@ class DatabaseInformationSchemaSuper(DatabaseInformationBase, Generic[DatabaseT]
         Judge result.
         """
 
-        # Handle parameter.
+        # Set parameter.
 
         # Judge.
         judge = (
@@ -255,7 +255,7 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
         self,
         database: str,
         *,
-        refresh: bool = True
+        cache: bool = True
     ) -> bool: ...
 
     @overload
@@ -264,7 +264,7 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
         database: str,
         *,
         table: str,
-        refresh: bool = True
+        cache: bool = True
     ) -> bool: ...
 
     @overload
@@ -273,7 +273,7 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
         database: str,
         table: str,
         column: str,
-        refresh: bool = True
+        cache: bool = True
     ) -> bool: ...
 
     def exist(
@@ -281,7 +281,7 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
         database: str,
         table: str | None = None,
         column: str | None = None,
-        refresh: bool = True
+        cache: bool = True
     ) -> bool:
         """
         Judge database or table or column whether it exists.
@@ -291,21 +291,21 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
         database : Database name.
         table : Table name.
         column : Column name.
-        refresh : Whether refresh cache data. Cache can improve efficiency.
+        cache : Whether use cache data, can improve efficiency.
 
         Returns
         -------
         Judge result.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if (
-            refresh
-            or self.db._schema is None
+            cache
+            and self.db._schema is not None
         ):
-            schema = self.schema()
-        else:
             schema = self.db._schema
+        else:
+            schema = self.schema()
 
         # Judge.
         result = self.handle_exist(schema, database, table, column)
@@ -395,7 +395,7 @@ class DatabaseInformationSchemaAsync(DatabaseInformationSchemaSuper['rdb.Databas
         Judge result.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if (
             refresh
             or self.db._schema is None