reydb 1.3.6__py3-none-any.whl → 1.3.7__py3-none-any.whl

reydb/rconfig.py

@@ -38,7 +38,7 @@ ConfigValueT = TypeVar('T', bound=ConfigValue) # Any.
 DatabaseEngineT = TypeVar('DatabaseEngineT', 'rengine.DatabaseEngine', 'rengine.DatabaseEngineAsync')
 
 
-class DatabaseORMTableConfig(rorm.Model, table=True):
+class DatabaseORMTableConfig(rorm.Table):
     """
     Database `config` table ORM model.
     """

reydb/rerror.py

@@ -32,7 +32,7 @@ __all__ = (
 DatabaseEngineT = TypeVar('DatabaseEngineT', 'rdb.Database', 'rdb.DatabaseEngineAsync')
 
 
-class DatabaseORMTableError(rorm.Model, table=True):
+class DatabaseORMTableError(rorm.Table):
     """
     Database `error` table ORM model.
     """

reydb/rorm.py

@@ -29,7 +29,7 @@ from sqlalchemy.sql._typing import _ColumnExpressionArgument
 from sqlalchemy.ext.asyncio import AsyncSessionTransaction
 from sqlalchemy.dialects.mysql import Insert, types as types_mysql
 from sqlalchemy.exc import SAWarning
-from sqlmodel import SQLModel, Session, Table
+from sqlmodel import SQLModel, Session, Table as STable
 from sqlmodel.main import SQLModelMetaclass, FieldInfo, default_registry
 from sqlmodel.ext.asyncio.session import AsyncSession
 from sqlmodel.sql._expression_select_cls import SelectOfScalar as Select
@@ -57,6 +57,8 @@ __all__ = (
     'DatabaseORMModelField',
     'DatabaseORMModel',
     'DatabaseORMModelMethod',
+    'DatabaseORMModelTableMeta',
+    'DatabaseORMModelTable',
     'DatabaseORMSuper',
     'DatabaseORM',
     'DatabaseORMAsync',
@@ -99,7 +101,7 @@ class DatabaseORMBase(DatabaseBase):
 
 class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
     """
-    Database ORM base meta type.
+    Database ORM meta type.
     """
 
 
@@ -181,7 +183,7 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
             '__annotations__' in attrs
             and hasattr(cls, '__table__')
         ):
-            table: Table = cls.__table__
+            table: STable = cls.__table__
             for index in table.indexes:
                 index_name = '_'.join(
                     column.key
@@ -383,7 +385,7 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel, metaclass=model_metaclass):
 
 
     @classmethod
-    def _get_table(cls_or_self) -> Table:
+    def _get_table(cls_or_self) -> STable:
         """
         Return mapping database table instance.
 
@@ -393,7 +395,7 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel, metaclass=model_metaclass):
         """
 
         # Get.
-        table: Table = cls_or_self.__table__
+        table: STable = cls_or_self.__table__
 
         return table
 
@@ -511,6 +513,54 @@ class DatabaseORMModelMethod(DatabaseORMBase):
         return instance
 
 
+class DatabaseORMModelTableMeta(DatabaseORMModelMeta):
+    """
+    Database ORM table meta type.
+    """
+
+
+    def __new__(
+        cls,
+        name: str,
+        bases: tuple[Type],
+        attrs: dict[str, Any],
+        **kwargs: Any
+    ) -> Type:
+        """
+        Create type.
+
+        Parameters
+        ----------
+        name : Type name.
+        bases : Type base types.
+        attrs : Type attributes and methods dictionary.
+        kwargs : Type other key arguments.
+        """
+
+        # Parameter.
+        if '__annotations__' in attrs:
+            kwargs['table'] = True
+
+        # Super.
+        new_cls = super().__new__(cls, name, bases, attrs, **kwargs)
+
+        return new_cls
+
+
+class DatabaseORMModelTable(DatabaseORMModel, metaclass=DatabaseORMModelTableMeta):
+    """
+    Database ORM model table type.
+    Based on `sqlalchemy` and `sqlmodel` package.
+
+    Examples
+    --------
+    >>> class Foo(DatabaseORMModelTable):
+    ...     __name__ = 'Table name, default is class name.'
+    ...     __comment__ = 'Table comment.'
+    ...     ...
+    """
+
+
 class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseEngineT, DatabaseORMSessionT]):
     """
     Database ORM super type.
@@ -1956,6 +2006,7 @@ metadata = default_registry.metadata
 
 ## Database ORM model type.
 Model = DatabaseORMModel
+Table = DatabaseORMModelTable
 
 ## Database ORM model field type.
 Field = DatabaseORMModelField

{reydb-1.3.6.dist-info → reydb-1.3.7.dist-info}/METADATA

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

{reydb-1.3.6.dist-info → reydb-1.3.7.dist-info}/RECORD

@@ -2,15 +2,15 @@ reydb/__init__.py,sha256=BnJsTzcwqeQ8-5Boqsehgcpc1eSDkv41v0kdb10gAgM,643
 reydb/rall.py,sha256=5GI0yuwF72XypNZ1DYIxKizo2Z5pR88Uv0nUpHKYhCk,379
 reydb/rbase.py,sha256=S3ip2PxvLn2Spgv5G_xd7xgC-U4wjEoAZ7Up25ZQvLk,8223
 reydb/rbuild.py,sha256=6ZkU3LGkIk04KTPtd8fgTC4pX93p1tvbOhZWWEi-v5A,40846
-reydb/rconfig.py,sha256=DFGTyoixqlSMGeWyd1os9K7YxnyY3RfgvPqQzZQlMQM,18161
+reydb/rconfig.py,sha256=uMzmOzs4ZJVmSmvH4X4Kj6TA2JjRUZHfyn6enGMS0Tc,18149
 reydb/rconn.py,sha256=ujyTAqR7FLr758EHDr04e0MTHDGDQEF_-YkfkYc8XRI,6986
 reydb/rdb.py,sha256=IhZLyXWZ5tiTWe2oq-nEkzTJW2ClvgT2-37OK-eOTXU,6063
 reydb/rengine.py,sha256=4tEIWxhtQ220_DZYb180hXhUwcxKGnPcv0yLaH1l0X4,17048
-reydb/rerror.py,sha256=M7RPXwywLYl5Vew7jfXxUxVnBrM1b_T6V9Izt4B8zI0,14791
+reydb/rerror.py,sha256=K681wWDpFrsTV7puoO1LIBLr0E-yqFxFn09k6kKCYHI,14779
 reydb/rexec.py,sha256=bVPT8kueKnK5HWLtYklE5Vgc4crL7QxBEE3S0MQgRB4,52647
 reydb/rinfo.py,sha256=c5otyOikGMVnLFhPbtlgmnFBRR3NMP7xcmMW-LQdaQk,18314
-reydb/rorm.py,sha256=74WHZ3wKa3y8bqHR9CcJO2JBc4Z8A8eTAmFae8RL0Hc,49862
-reydb-1.3.6.dist-info/METADATA,sha256=kM7W1Wu13bUxQ11aAytu8QMl_FPmCQxE49iAZG304kk,1653
-reydb-1.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.3.6.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.3.6.dist-info/RECORD,,
+reydb/rorm.py,sha256=yoK0DItEZvHHyjWpQwUES0VNRr1jvgcfKYoqf5CmBfU,51091
+reydb-1.3.7.dist-info/METADATA,sha256=o1nWPZWLozuaIwgS15QG8rzwCbtq0RcGrhd-ljtdQEM,1653
+reydb-1.3.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.3.7.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.3.7.dist-info/RECORD,,