reydb 1.2.17__py3-none-any.whl → 1.2.19__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'