reydb 1.1.49__py3-none-any.whl → 1.1.51__py3-none-any.whl

reydb/__init__.py

@@ -19,5 +19,6 @@ rerror : Database error methods.
 rexec : Database execute methods.
 rfile : Database file methods.
 rinfo : Database information methods.
+rorm : Database ORM methods.
 rparam : Database parameter methods.
 """

reydb/rall.py

@@ -18,4 +18,5 @@ from .rerror import *
 from .rexec import *
 from .rfile import *
 from .rinfo import *
+from .rorm import *
 from .rparam import *

reydb/rbuild.py

@@ -15,7 +15,6 @@ from reykit.rbase import throw
 from reykit.rstdout import ask
 
 from .rbase import DatabaseBase, extract_path
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -52,17 +51,17 @@ class DatabaseBuild(DatabaseBase):
     """
 
 
-    def __init__(self, database: Database | DatabaseConnection) -> None:
+    def __init__(self, db: Database) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        database : Database or DatabaseConnection instance.
+        db: `Database` instance.
         """
 
         # Set attribute.
-        self.database = database
+        self.db = db
         self._schema: dict[str, dict[str, list[str]]] | None = None
 
 
@@ -93,7 +92,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -343,7 +342,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -379,7 +378,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -472,7 +471,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -505,7 +504,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -538,7 +537,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -588,7 +587,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -703,7 +702,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -774,7 +773,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -893,7 +892,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -928,7 +927,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -961,7 +960,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -987,7 +986,7 @@ class DatabaseBuild(DatabaseBase):
         # Handle parameter.
         database, table, column = extract_path(path)
         if self._schema is None:
-            self._schema = self.database.schema(False)
+            self._schema = self.db.schema(False)
 
         # Judge.
         judge = (
@@ -1077,7 +1076,7 @@ class DatabaseBuild(DatabaseBase):
             database = params['name']
 
             ## Exist.
-            exist = self.database.build.exist((database, None, None))
+            exist = self.db.build.exist((database, None, None))
             if exist:
                 continue
 
@@ -1088,7 +1087,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.database.execute(sql)
+            self.db.execute(sql)
 
             ## Report.
             text = f"Database '{database}' build completed."
@@ -1100,7 +1099,7 @@ class DatabaseBuild(DatabaseBase):
             database, table, _ = extract_path(path)
 
             ## Exist.
-            exist = self.database.build.exist((database, table, None))
+            exist = self.db.build.exist((database, table, None))
             if exist:
                 continue
 
@@ -1111,7 +1110,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.database.execute(sql)
+            self.db.execute(sql)
 
             ## Report.
             text = f"Table '{table}' of database '{database}' build completed."
@@ -1123,7 +1122,7 @@ class DatabaseBuild(DatabaseBase):
             database, view, _ = extract_path(path)
 
             ## Exist.
-            exist = self.database.build.exist((database, view, None))
+            exist = self.db.build.exist((database, view, None))
             if exist:
                 continue
 
@@ -1134,7 +1133,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.database.execute(sql)
+            self.db.execute(sql)
 
             ## Report.
             text = f"View '{view}' of database '{database}' build completed."
@@ -1146,7 +1145,7 @@ class DatabaseBuild(DatabaseBase):
             database, view, _ = extract_path(path)
 
             ## Exist.
-            exist = self.database.build.exist((database, view, None))
+            exist = self.db.build.exist((database, view, None))
             if exist:
                 continue
 
@@ -1157,7 +1156,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.database.execute(sql)
+            self.db.execute(sql)
 
             ## Report.
             text = f"View '{view}' of database '{database}' build completed."

reydb/rconfig.py

@@ -19,7 +19,6 @@ from datetime import (
 )
 from reykit.rbase import null, throw
 
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -49,13 +48,17 @@ class DatabaseConfig(object):
     """
 
 
-    def __init__(self, database: Database | DatabaseConnection) -> None:
+    def __init__(self, db: Database) -> None:
         """
         Build instance attributes.
+
+        Parameters
+        ----------
+        db: `Database` instance.
         """
 
         # Build.
-        self.database = database
+        self.db = db
 
         ## Database path name.
         self.db_names = {
@@ -180,7 +183,7 @@ class DatabaseConfig(object):
         ]
 
         # Build.
-        self.database.build.build(databases, tables, views_stats=views_stats)
+        self.db.build.build(databases, tables, views_stats=views_stats)
 
 
     @property
@@ -194,7 +197,7 @@ class DatabaseConfig(object):
         """
 
         # Get.
-        result = self.database.execute.select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             ['key', 'value', 'type', 'note'],
             order='IFNULL(`update_time`, `create_time`) DESC'
@@ -230,7 +233,7 @@ class DatabaseConfig(object):
 
         # Get.
         where = '`key` = :key'
-        result = self.database.execute.select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             '`value`',
             where,
@@ -276,7 +279,7 @@ class DatabaseConfig(object):
             'type': type(default).__name__,
             'note': default_note
         }
-        result = self.database.execute.insert(
+        result = self.db.execute.insert(
             (self.db_names['base'], self.db_names['base.config']),
             data,
             'ignore'
@@ -317,7 +320,7 @@ class DatabaseConfig(object):
                 row['type'] = type(row['value']).__name__
 
         # Update.
-        self.database.execute.insert(
+        self.db.execute.insert(
             (self.db_names['base'], self.db_names['base.config']),
             data,
             'update'
@@ -340,7 +343,7 @@ class DatabaseConfig(object):
         else:
             where = '`key` in :key'
             limit = None
-        result = self.database.execute.delete(
+        result = self.db.execute.delete(
             (self.db_names['base'], self.db_names['base.config']),
             where,
             limit=limit,
@@ -362,7 +365,7 @@ class DatabaseConfig(object):
         """
 
         # Get.
-        result = self.database.execute.select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             ['key', 'value']
         )
@@ -388,7 +391,7 @@ class DatabaseConfig(object):
         """
 
         # Get.
-        result = self.database.execute.select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             '`key`'
         )
@@ -413,7 +416,7 @@ class DatabaseConfig(object):
         """
 
         # Get.
-        result = self.database.execute.select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             '`value`'
         )
@@ -475,7 +478,7 @@ class DatabaseConfig(object):
             'type': type(value).__name__,
             'note': note
         }
-        self.database.execute.insert(
+        self.db.execute.insert(
             (self.db_names['base'], self.db_names['base.config']),
             data,
             'update'

reydb/rconn.py

@@ -10,6 +10,7 @@
 
 
 from typing import Self
+from sqlalchemy import Transaction
 
 from .rbase import DatabaseBase
 from .rdb import Database
@@ -36,38 +37,19 @@ class DatabaseConnection(DatabaseBase):
 
         Parameters
         ----------
-        db : Database instance.
+        db : `Database` instance.
         autocommit: Whether automatic commit connection.
         """
 
-        # Build.
-        self.db = db
-        self.autocommit = autocommit
-        self.conn = db.engine.connect()
-        self.begin = None
-
-
-    @property
-    def execute(self):
-        """
-        Build `database execute` instance.
-
-        Returns
-        -------
-        Instance.
-        """
-
         # Import.
         from .rexec import DatabaseExecute
 
-        # Create transaction.
-        if self.begin is None:
-            self.begin = self.conn.begin()
-
         # Build.
-        exec = DatabaseExecute(self)
-
-        return exec
+        self.db = db
+        self.autocommit = autocommit
+        self.conn = db.engine.connect()
+        self.exec = DatabaseExecute(self)
+        self.begin: Transaction | None = None
 
 
     def commit(self) -> None:
@@ -138,6 +120,23 @@ class DatabaseConnection(DatabaseBase):
     __del__ = close
 
 
+    @property
+    def execute(self):
+        """
+        Build `database execute` instance.
+
+        Returns
+        -------
+        Instance.
+        """
+
+        # Create transaction.
+        if self.begin is None:
+            self.begin = self.conn.begin()
+
+        return self.exec
+
+
     @property
     def insert_id(self) -> int:
         """

reydb/rdb.py

@@ -25,11 +25,13 @@ __all__ = (
 
 class Database(DatabaseBase):
     """
-    Database type.
-    Based `MySQL`.
+    Database type, based `MySQL`.
+
+    Attributes
+    ----------
+    default_report : Whether default to report execution.
     """
 
-    # Whether default to report execution.
     default_report: bool = False
 
 
@@ -206,45 +208,6 @@ class Database(DatabaseBase):
         return keep_n, overflow_n
 
 
-    def connect(self, autocommit: bool = False):
-        """
-        Build `DatabaseConnection` instance.
-
-        Parameters
-        ----------
-        autocommit: Whether automatic commit connection.
-
-        Returns
-        -------
-        Database connection instance.
-        """
-
-        # Import.
-        from .rconn import DatabaseConnection
-
-        # Build.
-        conn = DatabaseConnection(self, autocommit)
-
-        return conn
-
-
-    @property
-    def execute(self):
-        """
-        Build `database execute` instance.
-
-        Returns
-        -------
-        Instance.
-        """
-
-        # Build.
-        dbconn = self.connect(True)
-        exec = dbconn.execute
-
-        return exec
-
-
     def schema(self, filter_default: bool = True) -> dict[str, dict[str, list[str]]]:
         """
         Get schemata of databases and tables and columns.
@@ -309,12 +272,70 @@ class Database(DatabaseBase):
             column_list.append(column)
 
         ## Add empty database.
-        for database_name in database_names:
-            schema_dict[database_name] = None
+        for name in database_names:
+            schema_dict[name] = None
 
         return schema_dict
 
 
+    def connect(self, autocommit: bool = False):
+        """
+        Build `DatabaseConnection` instance.
+
+        Parameters
+        ----------
+        autocommit: Whether automatic commit connection.
+
+        Returns
+        -------
+        Database connection instance.
+        """
+
+        # Import.
+        from .rconn import DatabaseConnection
+
+        # Build.
+        conn = DatabaseConnection(self, autocommit)
+
+        return conn
+
+
+    @property
+    def execute(self):
+        """
+        Build `DatabaseExecute` instance.
+
+        Returns
+        -------
+        Instance.
+        """
+
+        # Build.
+        dbconn = self.connect(True)
+        exec = dbconn.execute
+
+        return exec
+
+
+    @property
+    def orm(self):
+        """
+        Build `DatabaseORM` instance.
+
+        Returns
+        -------
+        Instance.
+        """
+
+        # Import.
+        from .rorm import DatabaseORM
+
+        # Build.
+        orm = DatabaseORM(self)
+
+        return orm
+
+
     @property
     def info(self):
         """

reydb/rerror.py

@@ -13,10 +13,9 @@ from typing import Any
 from collections.abc import Callable
 from traceback import StackSummary
 from functools import wraps as functools_wraps
-from reykit.rbase import T, Exit, throw, catch_exc
+from reykit.rbase import T, Exit, catch_exc
 
 from .rbase import DatabaseBase
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -32,17 +31,17 @@ class DatabaseError(DatabaseBase):
     """
 
 
-    def __init__(self, database: Database | DatabaseConnection) -> None:
+    def __init__(self, db: Database) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        database : Database or DatabaseConnection instance.
+        db: `Database` instance.
         """
 
         # Build.
-        self.database = database
+        self.db = db
 
         ## Database path name.
         self.db_names = {
@@ -184,7 +183,7 @@ class DatabaseError(DatabaseBase):
         ]
 
         # Build.
-        self.database.build.build(databases, tables, views_stats=views_stats)
+        self.db.build.build(databases, tables, views_stats=views_stats)
 
 
     def record(
@@ -223,7 +222,7 @@ class DatabaseError(DatabaseBase):
         }
 
         # Insert.
-        self.database.execute.insert(
+        self.db.execute.insert(
             (self.db_names['base'], self.db_names['base.error']),
             data=data
         )

reydb/rexec.py

@@ -50,7 +50,7 @@ class DatabaseExecute(DatabaseBase):
 
         Parameters
         ----------
-        dbconn : DatabaseConnection instance.
+        dbconn : `DatabaseConnection` instance.
         """
 
         # Build.

reydb/rfile.py

@@ -11,11 +11,9 @@
 
 from typing import TypedDict, overload
 from datetime import datetime
-from reykit.rbase import throw
 from reykit.ros import File, Folder, get_md5
 
 from .rbase import DatabaseBase
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -34,17 +32,17 @@ class DatabaseFile(DatabaseBase):
     """
 
 
-    def __init__(self, database: Database | DatabaseConnection) -> None:
+    def __init__(self, db: Database) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        database : Database or DatabaseConnection instance.
+        db: `Database` instance.
         """
 
         # Build.
-        self.database = database
+        self.db = db
 
         ## Database path name.
         self.db_names = {
@@ -274,7 +272,7 @@ class DatabaseFile(DatabaseBase):
         ]
 
         # Build.
-        self.database.build.build(databases, tables, views, views_stats)
+        self.db.build.build(databases, tables, views, views_stats)
 
 
     def upload(
@@ -302,7 +300,7 @@ class DatabaseFile(DatabaseBase):
         """
 
         # Handle parameter.
-        conn = self.database.connect()
+        conn = self.db.connect()
         match source:
 
             ## File path.
@@ -419,7 +417,7 @@ class DatabaseFile(DatabaseBase):
         )
 
         # Execute SQL.
-        result = self.database.execute(sql, file_id=file_id)
+        result = self.db.execute(sql, file_id=file_id)
 
         # Check.
         if result.empty:
@@ -471,7 +469,7 @@ class DatabaseFile(DatabaseBase):
         )
 
         # Execute SQL.
-        result = self.database.execute(sql, file_id=file_id)
+        result = self.db.execute(sql, file_id=file_id)
 
         # Check.
         if result.empty: