reydb 1.2.17__py3-none-any.whl → 1.2.18__py3-none-any.whl

reydb/rconfig.py

@@ -24,7 +24,7 @@ from .rbase import DatabaseBase
 
 
 __all__ = (
-    'DatabaseTableConfig',
+    'DatabaseORMTableConfig',
     'DatabaseConfigSuper',
     'DatabaseConfig',
     'DatabaseConfigAsync'
@@ -38,9 +38,9 @@ ConfigValueT = TypeVar('T', bound=ConfigValue) # Any.
 DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 
 
-class DatabaseTableConfig(rorm.Model, table=True):
+class DatabaseORMTableConfig(rorm.Model, table=True):
     """
-    Database `config` table model.
+    Database `config` table ORM model.
     """
 
     __name__ = 'config'
@@ -59,6 +59,8 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
     Can create database used `self.build_db` method.
     """
 
+    _checked: bool = False
+
 
     def __init__(self, db: DatabaseT) -> None:
         """
@@ -72,8 +74,16 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
         # Build.
         self.db = db
 
+        # Build Database.
+        if not self._checked:
+            if type(self) == DatabaseConfig:
+                self.build_db()
+            elif type(self) == DatabaseConfigAsync:
+                db.sync_database.config.build_db()
+            self._checked = True
+
 
-    def handle_build_db(self) -> tuple[list[type[DatabaseTableConfig]], list[dict[str, Any]]] :
+    def handle_build_db(self) -> tuple[list[type[DatabaseORMTableConfig]], list[dict[str, Any]]] :
         """
         Handle method of check and build database tables.
 
@@ -86,7 +96,7 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
         database = self.db.database
 
         ## Table.
-        tables = [DatabaseTableConfig]
+        tables = [DatabaseORMTableConfig]
 
         ## View stats.
         views_stats = [

reydb/rdb.py

@@ -9,7 +9,7 @@
 """
 
 
-from typing import TypeVar, Generic
+from typing import TypeVar, Generic, overload
 from urllib.parse import quote as urllib_quote
 from pymysql.constants.CLIENT import MULTI_STATEMENTS
 from sqlalchemy import Engine, create_engine as sqlalchemy_create_engine
@@ -519,6 +519,30 @@ class Database(
     """
 
 
+    @property
+    def async_database(self) -> 'DatabaseAsync':
+        """
+        Same engine `DatabaseAsync` instance.
+        """
+
+        # Build.
+        db = DatabaseAsync(
+            self.host,
+            self.port,
+            self.username,
+            self.password,
+            self.database,
+            self.pool_size,
+            self.max_overflow,
+            self.pool_timeout,
+            self.pool_recycle,
+            self.echo,
+            **self.query
+        )
+
+        return db
+
+
 class DatabaseAsync(
     DatabaseSuper[
         AsyncEngine,
@@ -539,6 +563,30 @@ class DatabaseAsync(
     """
 
 
+    @property
+    def sync_database(self) -> Database:
+        """
+        Same engine `Database` instance.
+        """
+
+        # Build.
+        db = Database(
+            self.host,
+            self.port,
+            self.username,
+            self.password,
+            self.database,
+            self.pool_size,
+            self.max_overflow,
+            self.pool_timeout,
+            self.pool_recycle,
+            self.echo,
+            **self.query
+        )
+
+        return db
+
+
     async def dispose(self) -> None:
         """
         Dispose asynchronous connections.

reydb/rerror.py

@@ -22,7 +22,7 @@ from .rbase import DatabaseBase
 
 
 __all__ = (
-    'DatabaseTableError',
+    'DatabaseORMTableError',
     'DatabaseErrorSuper',
     'DatabaseError',
     'DatabaseErrorAsync'
@@ -32,9 +32,9 @@ __all__ = (
 DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 
 
-class DatabaseTableError(rorm.Model, table=True):
+class DatabaseORMTableError(rorm.Model, table=True):
     """
-    Database `error` table model.
+    Database `error` table ORM model.
     """
 
     __name__ = 'error'
@@ -53,6 +53,8 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
     Can create database used `self.build_db` method.
     """
 
+    _checked: bool = False
+
 
     def __init__(self, db: DatabaseT) -> None:
         """
@@ -66,8 +68,16 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         # Build.
         self.db = db
 
+        # Build Database.
+        if not self._checked:
+            if type(self) == DatabaseError:
+                self.build_db()
+            elif type(self) == DatabaseErrorAsync:
+                db.sync_database.error.build_db()
+            self._checked = True
+
 
-    def handle_build_db(self) -> tuple[list[type[DatabaseTableError]], list[dict[str, Any]]]:
+    def handle_build_db(self) -> tuple[list[type[DatabaseORMTableError]], list[dict[str, Any]]]:
         """
         Handle method of check and build database tables.
 
@@ -80,7 +90,7 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         database = self.db.database
 
         ## Table.
-        tables = [DatabaseTableError]
+        tables = [DatabaseORMTableError]
 
         ## View stats.
         views_stats = [

reydb/rexec.py

@@ -28,7 +28,6 @@ from .rbase import DatabaseBase, handle_sql, handle_data
 
 __all__ = (
     'Result',
-    'ResultORM',
     'DatabaseExecuteSuper',
     'DatabaseExecute',
     'DatabaseExecuteAsync'

reydb/rorm.py

@@ -560,32 +560,12 @@ class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseT, DatabaseORMSessionT])
 class DatabaseORM(DatabaseORMSuper['rdb.Database', 'DatabaseORMSession']):
     """
     Database ORM type.
-
-    Attributes
-    ----------
-    metaData : Registry metadata instance.
-    DatabaseModel : Database ORM model type.
-    Field : Database ORM model field type.
-    Config : Database ORM model config type.
-    types : Database ORM model filed types module.
-    wrap_validate_model : Create decorator of validate database ORM model.
-    wrap_validate_filed : Create decorator of validate database ORM model field.
     """
 
 
 class DatabaseORMAsync(DatabaseORMSuper['rdb.DatabaseAsync', 'DatabaseORMSessionAsync']):
     """
     Asynchronous database ORM type.
-
-    Attributes
-    ----------
-    metaData : Registry metadata instance.
-    DatabaseModel : Database ORM model type.
-    Field : Database ORM model field type.
-    Config : Database ORM model config type.
-    types : Database ORM model filed types module.
-    wrap_validate_model : Create decorator of validate database ORM model.
-    wrap_validate_filed : Create decorator of validate database ORM model field.
     """
 
 
@@ -1607,13 +1587,10 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
 class DatabaseORMStatementSelectSuper(DatabaseORMStatementSuper, Select):
     """
     Database ORM `select` statement super type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     def fields(self, *names: str) -> Self:
@@ -1672,13 +1649,10 @@ class DatabaseORMStatementSelectSuper(DatabaseORMStatementSuper, Select):
 class DatabaseORMStatementSelect(DatabaseORMStatement, DatabaseORMStatementSelectSuper, Generic[DatabaseORMModelT]):
     """
     Database ORM `select` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     @overload
@@ -1690,13 +1664,10 @@ class DatabaseORMStatementSelect(DatabaseORMStatement, DatabaseORMStatementSelec
 class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync, DatabaseORMStatementSelectSuper, Generic[DatabaseORMModelT]):
     """
     Asynchronous database ORM `select` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     @overload
@@ -1708,13 +1679,10 @@ class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync, DatabaseORMStat
 class DatabaseORMStatementInsertSuper(DatabaseORMStatementSuper, Insert):
     """
     Database ORM `select` statement super type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     def ignore(self) -> Self:
@@ -1794,37 +1762,28 @@ class DatabaseORMStatementInsertSuper(DatabaseORMStatementSuper, Insert):
 class DatabaseORMStatementInsert(DatabaseORMStatement, DatabaseORMStatementInsertSuper):
     """
     Database ORM `insert` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementInsertAsync(DatabaseORMStatementAsync, DatabaseORMStatementInsertSuper):
     """
     Asynchronous database ORM `insert` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementUpdateSuper(DatabaseORMStatementSuper, Update):
     """
     Database ORM `update` statement super type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     def where(self, *clauses: str | _ColumnExpressionArgument[bool]) -> Self:
@@ -1878,37 +1837,28 @@ class DatabaseORMStatementUpdateSuper(DatabaseORMStatementSuper, Update):
 class DatabaseORMStatementUpdate(DatabaseORMStatement, DatabaseORMStatementUpdateSuper):
     """
     Database ORM `update` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementUpdateAsync(DatabaseORMStatementAsync, DatabaseORMStatementUpdateSuper):
     """
     Asynchronous database ORM `update` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementDeleteSuper(DatabaseORMStatementSuper, Delete):
     """
     Database ORM `delete` statement super type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     def where(self, *clauses: str | _ColumnExpressionArgument[bool]) -> Self:
@@ -1962,25 +1912,19 @@ class DatabaseORMStatementDeleteSuper(DatabaseORMStatementSuper, Delete):
 class DatabaseORMStatementDelete(DatabaseORMStatement, DatabaseORMStatementDeleteSuper):
     """
     Database ORM `delete` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementDeleteAsync(DatabaseORMStatementAsync, DatabaseORMStatementDeleteSuper):
     """
     Asynchronous database ORM `delete` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 # Simple path.

{reydb-1.2.17.dist-info → reydb-1.2.18.dist-info}/METADATA

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

reydb-1.2.18.dist-info/RECORD

@@ -0,0 +1,15 @@
+reydb/__init__.py,sha256=MJkZy2rOM2VSj_L2kaKe6CJfsg334vb3OLVUqavWKfM,558
+reydb/rall.py,sha256=IxSPGh77xz7ndDC7J8kZ_66Gq_xTAztGtnELUku1Ouw,364
+reydb/rbase.py,sha256=sl2lZWQVC5kXTJid2v5zmy1lMshYLm2NhEQi_dnY_Bw,8232
+reydb/rbuild.py,sha256=QZF26KDL6oRb6RyMEtIJcbiX9TJzK2aUPqjqGjflF7s,80834
+reydb/rconfig.py,sha256=cPFt9QI_lj0u4tChBJ0kHYf2G788epbT2oSYk2r24yo,18010
+reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
+reydb/rdb.py,sha256=nieXxFqf07Dljl-12Ub8R8s-uNZjai7PN2rqlvOxyqw,15408
+reydb/rerror.py,sha256=O7lbnkAamQa1OKz6WJPeBUkzDTP6LNGqBqCfrI02DO4,14722
+reydb/rexec.py,sha256=uj87vAeKnqNg9tWCy0ycjI9uMj0IgZCS4waL9cC_mTY,52930
+reydb/rinfo.py,sha256=1lMnD-eN97vHrQ1DM8X7mQIhyLmCg6V0P2QwSeF07_c,18127
+reydb/rorm.py,sha256=-pb5SJBk2WOluWC0ci0OOCOKOj2MIxoy3oVRJ7whpFQ,49337
+reydb-1.2.18.dist-info/METADATA,sha256=SCX11Jre4BRem7gUw8lqaZ495-pNgrqhz45C3-3V4Ws,1647
+reydb-1.2.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.18.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.18.dist-info/RECORD,,

reydb-1.2.17.dist-info/RECORD

@@ -1,15 +0,0 @@
-reydb/__init__.py,sha256=MJkZy2rOM2VSj_L2kaKe6CJfsg334vb3OLVUqavWKfM,558
-reydb/rall.py,sha256=IxSPGh77xz7ndDC7J8kZ_66Gq_xTAztGtnELUku1Ouw,364
-reydb/rbase.py,sha256=sl2lZWQVC5kXTJid2v5zmy1lMshYLm2NhEQi_dnY_Bw,8232
-reydb/rbuild.py,sha256=QZF26KDL6oRb6RyMEtIJcbiX9TJzK2aUPqjqGjflF7s,80834
-reydb/rconfig.py,sha256=ZmVpoP7GuwuP3536Lz34kaZDG5MCVf0JFBaT5nm1-L8,17686
-reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
-reydb/rdb.py,sha256=s96XLLH8ZmJm-q4J9RRP6KGkxH3MGodPOcWqB-6-V4U,14356
-reydb/rerror.py,sha256=0AIe7ZpDEe60xTV_FJCCBwzFVHwONh7qxvYpgwzZDvI,14401
-reydb/rexec.py,sha256=DdmcJ6j4il06wEyvhttac2GpmGdsZJtOEljH7wUvca8,52948
-reydb/rinfo.py,sha256=1lMnD-eN97vHrQ1DM8X7mQIhyLmCg6V0P2QwSeF07_c,18127
-reydb/rorm.py,sha256=77QQgQglvA2b4fRH1xBqca7BQ-Hu2MudDopRPJ6E4J4,50761
-reydb-1.2.17.dist-info/METADATA,sha256=zfoqQQNi3sPymiV82KzaBJS_-c4ZA_3r2VIMq9xK3WU,1647
-reydb-1.2.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.17.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.17.dist-info/RECORD,,