reydb 1.2.2__py3-none-any.whl → 1.2.4__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,
@@ -24,6 +24,7 @@ from .rbase import DatabaseBase
 
 
 __all__ = (
+    'TableConfig',
     'DatabaseConfigSuper',
     'DatabaseConfig',
     'DatabaseConfigAsync'
@@ -37,6 +38,20 @@ ConfigValueT = TypeVar('T', bound=ConfigValue) # Any.
 DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 
 
+class TableConfig(rorm.Model, table=True):
+    """
+    Database `config` table model.
+    """
+
+    __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.')
+
+
 class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
     """
     Database config super type.
@@ -66,24 +81,20 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-    def handle_build_db(self) -> None:
+    def handle_build_db(self) -> tuple[list[type[TableConfig]], list[dict[str, Any]]] :
         """
         Handle method of check and build database tables, by `self.db_names`.
+
+        Returns
+        -------
+        Build database parameter.
         """
 
         # Set parameter.
+        TableConfig._set_name(self.db_names['config'])
 
         ## Table.
-        class Config(rorm.Model, table=True):
-            __name__ = self.db_names['config']
-            __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.')
-        tables = [Config]
+        tables = [TableConfig]
 
         ## View stats.
         views_stats = [

reydb/rerror.py

@@ -22,6 +22,7 @@ from .rbase import DatabaseBase
 
 
 __all__ = (
+    'TableError',
     'DatabaseErrorSuper',
     'DatabaseError',
     'DatabaseErrorAsync'
@@ -31,6 +32,20 @@ __all__ = (
 DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 
 
+class TableError(rorm.Model, table=True):
+    """
+    Database `error` table model.
+    """
+
+    __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.')
+
+
 class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
     """
     Database error super type.
@@ -60,24 +75,20 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-    def handle_build_db(self) -> None:
+    def handle_build_db(self) -> tuple[list[type[TableError]], list[dict[str, Any]]]:
         """
         Handle method of check and build database tables, by `self.db_names`.
+
+        Returns
+        -------
+        Build database parameter.
         """
 
         # Set parameter.
+        TableError._set_name(self.db_names['error'])
 
         ## Table.
-        class error(rorm.Model, table=True):
-            __name__ = self.db_names['error']
-            __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.')
-        tables = [error]
+        tables = [TableError]
 
         ## View stats.
         views_stats = [

reydb/rinfo.py

@@ -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,7 +291,7 @@ 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
         -------
@@ -300,12 +300,12 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
 
         # 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)

reydb/rorm.py

@@ -312,7 +312,7 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel, metaclass=model_metaclass):
 
 
     @classmethod
-    def _table(cls_or_self) -> Table:
+    def _get_table(cls_or_self) -> Table:
         """
         Return mapping database table instance.
 
@@ -327,6 +327,28 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel, metaclass=model_metaclass):
         return table
 
 
+    @classmethod
+    def _set_name(cls_or_self, name: str) -> None:
+        """
+        Set database table name.
+        """
+
+        # Get.
+        table = cls_or_self._get_table()
+        table.name = name
+
+
+    @classmethod
+    def _set_comment(cls_or_self, comment: str) -> None:
+        """
+        Set database table comment.
+        """
+
+        # Get.
+        table = cls_or_self._get_table()
+        table.comment = comment
+
+
     @property
     def _m(self):
         """
@@ -826,7 +848,7 @@ class DatabaseORMSession(
 
         # Handle parameter.
         tables = [
-            model._table()
+            model._get_table()
             for model in models
         ]
 
@@ -855,7 +877,7 @@ class DatabaseORMSession(
 
         # Handle parameter.
         tables = [
-            model._table()
+            model._get_table()
             for model in models
         ]
 
@@ -1192,7 +1214,7 @@ class DatabaseORMSessionAsync(
 
         # Handle parameter.
         tables = [
-            model._table()
+            model._get_table()
             for model in models
         ]
 
@@ -1222,7 +1244,7 @@ class DatabaseORMSessionAsync(
 
         # Handle parameter.
         tables = [
-            model._table()
+            model._get_table()
             for model in models
         ]
 

{reydb-1.2.2.dist-info → reydb-1.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.2.2
+Version: 1.2.4
 Summary: Database method set.
 Project-URL: homepage, https://github.com/reyxbo/reydb/
 Author-email: Rey <reyxbo@163.com>

reydb-1.2.4.dist-info/RECORD

@@ -0,0 +1,15 @@
+reydb/__init__.py,sha256=4mnlkfJfkBfxBpCotVUJ86f4AnT8plqlFbGiH3vZ4PM,550
+reydb/rall.py,sha256=IxSPGh77xz7ndDC7J8kZ_66Gq_xTAztGtnELUku1Ouw,364
+reydb/rbase.py,sha256=vx37yV6LlWP89nWAfYyOf0Xm3N_e9eB8z5Mxe-aTEo4,8248
+reydb/rbuild.py,sha256=imakdlqQXzQlbAukti3_REVU_h7IRRE3fwUk91LaIIM,80430
+reydb/rconfig.py,sha256=Z8h23-w_FTiDMu9-1Bdu6xpRqJt1j8EESNq0MsJRies,19157
+reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
+reydb/rdb.py,sha256=syyqZbEu92NbCj9O6_T6iAv7E46CyfQOC4T8qtPfHNs,14364
+reydb/rerror.py,sha256=cB3xAq1Zy97Mvq43ql9o-WtoSvgluXKqaQwHrHETrY8,14884
+reydb/rexec.py,sha256=djHx311c6mr1IjzNLqnGe-4yr3qNmYGUy4pHQA3WElQ,53042
+reydb/rinfo.py,sha256=LjrqTA7JJbWJsjXwV-zKpbE1htv-whg6239hoQj4yIU,18151
+reydb/rorm.py,sha256=2C2g0zd188pf9VoGH52TiVZkjd9y9YAZTqU4XJUSlhA,41411
+reydb-1.2.4.dist-info/METADATA,sha256=9f-mOq7OwHoRXtkOLKzkNskD7dt1s59Dv5foLX6N_Nw,1621
+reydb-1.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.4.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.4.dist-info/RECORD,,

reydb-1.2.2.dist-info/RECORD

@@ -1,15 +0,0 @@
-reydb/__init__.py,sha256=4mnlkfJfkBfxBpCotVUJ86f4AnT8plqlFbGiH3vZ4PM,550
-reydb/rall.py,sha256=IxSPGh77xz7ndDC7J8kZ_66Gq_xTAztGtnELUku1Ouw,364
-reydb/rbase.py,sha256=vx37yV6LlWP89nWAfYyOf0Xm3N_e9eB8z5Mxe-aTEo4,8248
-reydb/rbuild.py,sha256=rmwfkjxjhavcbyn-V0ZTqwKNq3wKmgvHng8p5I0dghQ,40281
-reydb/rconfig.py,sha256=5ZfFQwgt6JI5k1luv7PIj3H9Izuc6KNMOCFCJGBb1rQ,18998
-reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
-reydb/rdb.py,sha256=syyqZbEu92NbCj9O6_T6iAv7E46CyfQOC4T8qtPfHNs,14364
-reydb/rerror.py,sha256=renVDvi5e6-AC-y2KPksARPRX978WFh0Hqa9yfl9j1A,14735
-reydb/rexec.py,sha256=djHx311c6mr1IjzNLqnGe-4yr3qNmYGUy4pHQA3WElQ,53042
-reydb/rinfo.py,sha256=9qpVFqFwMol5_n9gE3zYLv9Fn5r2EuVD5ibgQkSXYyw,18168
-reydb/rorm.py,sha256=X99AKlpMQk3et9_3x1ddpKn1BxZRULLG8x_opYbWVX8,40934
-reydb-1.2.2.dist-info/METADATA,sha256=J_Jq9TRbL2LRW154knFoOtwv8wWVQQqhfup0YTfEwRM,1621
-reydb-1.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.2.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.2.dist-info/RECORD,,