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

reydb/rbuild.py

@@ -983,7 +983,7 @@ class DatabaseBuildSuper(DatabaseBase, Generic[DatabaseT]):
         """
 
         # Get.
-        table = model._table()
+        table = model._get_table()
         text = f'TABLE `{self.db.database}`.`{table}`'
         if 'mysql_charset' in table.kwargs:
             text += f" | CHARSET '{table.kwargs['mysql_charset']}'"
@@ -1146,7 +1146,7 @@ class DatabaseBuild(DatabaseBuildSuper['rdb.Database']):
                 or issubclass(params, DatabaseORMModel)
             ):
                 database = self.db.database
-                table = params._table().name
+                table = params._get_table().name
 
                 ## Exist.
                 if (
@@ -1367,7 +1367,7 @@ class DatabaseBuildAsync(DatabaseBuildSuper['rdb.DatabaseAsync']):
                 or issubclass(params, DatabaseORMModel)
             ):
                 database = self.db.database
-                table = params._table().name
+                table = params._get_table().name
 
                 ## Exist.
                 if (
@@ -2463,7 +2463,7 @@ class DatabaseBuildSuper(DatabaseBase, Generic[DatabaseT]):
         """
 
         # Get.
-        table = model._table()
+        table = model._get_table()
         text = f'TABLE `{self.db.database}`.`{table}`'
         if 'mysql_charset' in table.kwargs:
             text += f" | CHARSET '{table.kwargs['mysql_charset']}'"
@@ -2619,32 +2619,8 @@ class DatabaseBuild(DatabaseBuildSuper['rdb.Database']):
         # Table.
         for params in tables:
 
-            ## ORM.
-            if (
-                is_instance(params)
-                and isinstance(params, DatabaseORMModel)
-                or issubclass(params, DatabaseORMModel)
-            ):
-                database = self.db.database
-                table = params._table().name
-
-                ## Exist.
-                if (
-                    skip
-                    and self.db.schema.exist(self.db.database, table)
-                ):
-                    continue
-
-                ## Confirm.
-                if ask:
-                    text = self.get_orm_table_text(params)
-                    self.input_confirm_build(text)
-
-                ## Execute.
-                self.create_orm_table(params)
-
             ## Parameter.
-            else:
+            if type(params) == dict:
                 path: str | tuple[str, str] = params['path']
                 if type(path) == str:
                     database, table = self.db.database, path
@@ -2668,6 +2644,26 @@ class DatabaseBuild(DatabaseBuildSuper['rdb.Database']):
                 ### Execute.
                 self.db.execute(sql)
 
+            ## ORM.
+            else:
+                database = self.db.database
+                table = params._get_table().name
+
+                ## Exist.
+                if (
+                    skip
+                    and self.db.schema.exist(self.db.database, table)
+                ):
+                    continue
+
+                ## Confirm.
+                if ask:
+                    text = self.get_orm_table_text(params)
+                    self.input_confirm_build(text)
+
+                ## Execute.
+                self.create_orm_table(params)
+
             ## Report.
             text = f"Table '{table}' of database '{database}' build completed."
             print(text)
@@ -2847,7 +2843,7 @@ class DatabaseBuildAsync(DatabaseBuildSuper['rdb.DatabaseAsync']):
                 or issubclass(params, DatabaseORMModel)
             ):
                 database = self.db.database
-                table = params._table().name
+                table = params._get_table().name
 
                 ## Exist.
                 if (

reydb/rconfig.py

@@ -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.
@@ -45,7 +60,6 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
     Attributes
     ----------
     db_names : Database table name mapping dictionary.
-    Config : Database `config` table model.
     """
 
     db_names = {
@@ -54,16 +68,6 @@ 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.
@@ -77,7 +81,7 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-    def handle_build_db(self) -> tuple[list[type[Config]], list[dict[str, Any]]] :
+    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`.
 
@@ -87,10 +91,10 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
         """
 
         # Set parameter.
-        self.Config._name(self.db_names['config'])
+        TableConfig._set_name(self.db_names['config'])
 
         ## Table.
-        tables = [self.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.
@@ -39,7 +54,6 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
     Attributes
     ----------
     db_names : Database table name mapping dictionary.
-    Error : Database `error` table model.
     """
 
     db_names = {
@@ -48,16 +62,6 @@ 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.
@@ -71,7 +75,7 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-    def handle_build_db(self) -> tuple[list[type[Error]], list[dict[str, Any]]]:
+    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`.
 
@@ -81,10 +85,10 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         """
 
         # Set parameter.
-        self.Error._name(self.db_names['error'])
+        TableError._set_name(self.db_names['error'])
 
         ## Table.
-        tables = [self.Error]
+        tables = [TableError]
 
         ## View stats.
         views_stats = [

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.
 
@@ -328,24 +328,24 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel, metaclass=model_metaclass):
 
 
     @classmethod
-    def _name(cls_or_self, name: str) -> None:
+    def _set_name(cls_or_self, name: str) -> None:
         """
         Set database table name.
         """
 
         # Get.
-        table = cls_or_self._table()
+        table = cls_or_self._get_table()
         table.name = name
 
 
     @classmethod
-    def _comment(cls_or_self, comment: str) -> None:
+    def _set_comment(cls_or_self, comment: str) -> None:
         """
         Set database table comment.
         """
 
         # Get.
-        table = cls_or_self._table()
+        table = cls_or_self._get_table()
         table.comment = comment
 
 
@@ -848,7 +848,7 @@ class DatabaseORMSession(
 
         # Handle parameter.
         tables = [
-            model._table()
+            model._get_table()
             for model in models
         ]
 
@@ -877,7 +877,7 @@ class DatabaseORMSession(
 
         # Handle parameter.
         tables = [
-            model._table()
+            model._get_table()
             for model in models
         ]
 
@@ -1214,7 +1214,7 @@ class DatabaseORMSessionAsync(
 
         # Handle parameter.
         tables = [
-            model._table()
+            model._get_table()
             for model in models
         ]
 
@@ -1244,7 +1244,7 @@ class DatabaseORMSessionAsync(
 
         # Handle parameter.
         tables = [
-            model._table()
+            model._get_table()
             for model in models
         ]
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.2.3
+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.3.dist-info → reydb-1.2.4.dist-info}/RECORD

@@ -1,15 +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=8frMtmY8gKc-uYYaJPso9sm8IS3_CyTHrL_F0Wv5RI0,80554
-reydb/rconfig.py,sha256=g428a0npVNgB3PMJiEpVRPwyvWm63G9KLcEru4-vPTU,19144
+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=LcXyinipQw-saQxGwbkXU4BTOjb29RMX9hnAFidJN3Q,14871
+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=AVV50cC5Vm8pT6gIeBUAelXd3OpdQSldPsZltL8ceOg,41375
-reydb-1.2.3.dist-info/METADATA,sha256=IULuCfrYhhcnoLjLulnsgEy4R_Dzc9s5P9IrhRCVsAM,1621
-reydb-1.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.3.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.3.dist-info/RECORD,,
+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,,