reydb 1.1.49__py3-none-any.whl → 1.1.50__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/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/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:

reydb/rinfo.py

@@ -11,10 +11,8 @@
 
 from __future__ import annotations
 from typing import Any, Literal, overload
-from reykit.rbase import throw
 
 from .rbase import DatabaseBase
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -151,11 +149,11 @@ class DatabaseInformation(DatabaseBase):
         # Build.
         match self:
             case DatabaseInformationSchema():
-                table = DatabaseInformationDatabase(self._rdatabase, name)
+                table = DatabaseInformationDatabase(self.db, name)
             case DatabaseInformationDatabase():
-                table = DatabaseInformationTable(self._rdatabase, self._database_name, name)
+                table = DatabaseInformationTable(self.db, self.database, name)
             case DatabaseInformationTable():
-                table = DatabaseInformationColumn(self._rdatabase, self._database_name, self._table_name, name)
+                table = DatabaseInformationColumn(self.db, self.database, self.table, name)
             case _:
                 raise AssertionError("class '%s' does not have this method" % type(self).__name__)
 
@@ -193,18 +191,18 @@ class DatabaseInformationSchema(DatabaseInformation):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection
+        db: Database
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
+        db: Database instance.
         """
 
         # Set parameter.
-        self._rdatabase = rdatabase
+        self.db = db
 
 
     def _get_info_table(self) -> list[dict]:
@@ -217,7 +215,7 @@ class DatabaseInformationSchema(DatabaseInformation):
         """
 
         # Select.
-        result = self._rdatabase.execute.select(
+        result = self.db.execute.select(
             'information_schema.SCHEMATA',
             order='`schema_name`'
         )
@@ -256,21 +254,21 @@ class DatabaseInformationDatabase(DatabaseInformation):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection,
-        database_name: str
+        db: Database,
+        database: str
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
-        database_name : Database name.
+        db: Database instance.
+        database : Database name.
         """
 
         # Set parameter.
-        self._rdatabase = rdatabase
-        self._database_name = database_name
+        self.db = db
+        self.database = database
 
 
     def _get_info_attrs(self) -> dict:
@@ -283,19 +281,19 @@ class DatabaseInformationDatabase(DatabaseInformation):
         """
 
         # Select.
-        where = '`SCHEMA_NAME` = :database_name'
-        result = self._rdatabase.execute.select(
+        where = '`SCHEMA_NAME` = :database'
+        result = self.db.execute.select(
             'information_schema.SCHEMATA',
             where=where,
             limit=1,
-            database_name=self._database_name
+            database=self.database
         )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' not exist" % self._database_name
+        assert len(info_table) != 0, "database '%s' not exist" % self.database
 
         info_attrs = info_table[0]
 
@@ -312,19 +310,19 @@ class DatabaseInformationDatabase(DatabaseInformation):
         """
 
         # Select.
-        where = '`TABLE_SCHEMA` = :database_name'
-        result = self._rdatabase.execute.select(
+        where = '`TABLE_SCHEMA` = :database'
+        result = self.db.execute.select(
             'information_schema.TABLES',
             where=where,
             order='`TABLE_NAME`',
-            database_name=self._database_name
+            database=self.database
         )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' not exist" % self._database_name
+        assert len(info_table) != 0, "database '%s' not exist" % self.database
 
         return info_table
 
@@ -351,24 +349,24 @@ class DatabaseInformationTable(DatabaseInformation):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection,
-        database_name: str,
-        table_name: str
+        db: Database,
+        database: str,
+        table: str
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
-        database_name : Database name.
-        table_name : Table name.
+        db: Database instance.
+        database : Database name.
+        table : Table name.
         """
 
         # Set parameter.
-        self._rdatabase = rdatabase
-        self._database_name = database_name
-        self._table_name = table_name
+        self.db = db
+        self.database = database
+        self.table = table
 
 
     def _get_info_attrs(self) -> dict:
@@ -381,20 +379,20 @@ class DatabaseInformationTable(DatabaseInformation):
         """
 
         # Select.
-        where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name'
-        result = self._rdatabase.execute.select(
+        where = '`TABLE_SCHEMA` = :database AND `TABLE_NAME` = :table_'
+        result = self.db.execute.select(
             'information_schema.TABLES',
             where=where,
             limit=1,
-            database_name=self._database_name,
-            table_name=self._table_name
+            database=self.database,
+            table_=self.table
         )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' or table '%s' not exist" % (self._database_name, self._table_name)
+        assert len(info_table) != 0, "database '%s' or table '%s' not exist" % (self.database, self.table)
 
         info_attrs = info_table[0]
 
@@ -411,20 +409,20 @@ class DatabaseInformationTable(DatabaseInformation):
         """
 
         # Select.
-        where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name'
-        result = self._rdatabase.execute.select(
+        where = '`TABLE_SCHEMA` = :database AND `TABLE_NAME` = :table_'
+        result = self.db.execute.select(
             'information_schema.COLUMNS',
             where=where,
             order='`ORDINAL_POSITION`',
-            database_name=self._database_name,
-            table_name=self._table_name
+            database=self.database,
+            table_=self.table
         )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' or table '%s' not exist" % (self._database_name, self._table_name)
+        assert len(info_table) != 0, "database '%s' or table '%s' not exist" % (self.database, self.table)
 
         return info_table
 
@@ -445,27 +443,27 @@ class DatabaseInformationColumn(DatabaseInformation):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection,
-        database_name: str,
-        table_name: str,
-        column_name: str
+        db: Database,
+        database: str,
+        table: str,
+        column: str
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
-        database_name : Database name.
-        table_name : Table name.
-        column_name : Column name.
+        db: Database instance.
+        database : Database name.
+        table : Table name.
+        column : Column name.
         """
 
         # Set parameter.
-        self._rdatabase = rdatabase
-        self._database_name = database_name
-        self._table_name = table_name
-        self._column_name = column_name
+        self.db = db
+        self.database = database
+        self.table = table
+        self.column = column
 
 
     def _get_info_attrs(self) -> dict:
@@ -478,21 +476,21 @@ class DatabaseInformationColumn(DatabaseInformation):
         """
 
         # Select.
-        where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name AND `COLUMN_NAME` = :column_name'
-        result = self._rdatabase.execute.select(
+        where = '`TABLE_SCHEMA` = :database AND `TABLE_NAME` = :table_ AND `COLUMN_NAME` = :column'
+        result = self.db.execute.select(
             'information_schema.COLUMNS',
             where=where,
             limit=1,
-            database_name=self._database_name,
-            table_name=self._table_name,
-            column_name=self._column_name
+            database=self.database,
+            table_=self.table,
+            column=self.column
         )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' or table '%s' or column '%s' not exist" % (self._database_name, self._table_name, self._column_name)
+        assert len(info_table) != 0, "database '%s' or table '%s' or column '%s' not exist" % (self.database, self.table, self.column)
 
         info_attrs = info_table[0]
 

reydb/rorm.py

@@ -0,0 +1,39 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@Time    : 2025-09-23 00:50:32
+@Author  : Rey
+@Contact : reyxbo@163.com
+@Explain : Database ORM methods.
+"""
+
+
+from sqlmodel import SQLModel, Session
+
+from .rbase import DatabaseBase
+from .rdb import Database
+
+
+__all__ = (
+    'DatabaseORM',
+)
+
+
+class DatabaseORM(DatabaseBase):
+    """
+    Database ORM type.
+    """
+
+
+    def __init__(self, db: Database) -> None:
+        """
+        Build instance attributes.
+
+        Parameters
+        ----------
+        db: Database instance.
+        """
+
+        # Build.
+        self.db = db

reydb/rparam.py

@@ -12,7 +12,6 @@
 from typing import overload
 
 from .rbase import DatabaseBase
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -32,7 +31,7 @@ class DatabaseParameters(DatabaseBase):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection,
+        db: Database,
         global_: bool
     ) -> None:
         """
@@ -40,12 +39,12 @@ class DatabaseParameters(DatabaseBase):
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
+        db: Database instance.
         global\\_ : Whether base global.
         """
 
         # Set parameter.
-        self.rdatabase = rdatabase
+        self.db = db
         self.global_ = global_
 
 
@@ -126,13 +125,13 @@ class DatabaseParametersStatus(DatabaseParameters):
 
         ## Dictionary.
         if key is None:
-            result = self.rdatabase.execute(sql, key=key)
+            result = self.db.execute(sql, key=key)
             status = result.to_dict(val_field=1)
 
         ## Value.
         else:
             sql += ' LIKE :key'
-            result = self.rdatabase.execute(sql, key=key)
+            result = self.db.execute(sql, key=key)
             row = result.first()
             if row is None:
                 status = None
@@ -196,13 +195,13 @@ class DatabaseParametersVariable(DatabaseParameters):
 
         ## Dictionary.
         if key is None:
-            result = self.rdatabase.execute(sql, key=key)
+            result = self.db.execute(sql, key=key)
             variables = result.to_dict(val_field=1)
 
         ## Value.
         else:
             sql += ' LIKE :key'
-            result = self.rdatabase.execute(sql, key=key)
+            result = self.db.execute(sql, key=key)
             row = result.first()
             if row is None:
                 variables = None
@@ -244,7 +243,7 @@ class DatabaseParametersVariable(DatabaseParameters):
             sql = f'SET {sql_set}'
 
         # Execute SQL.
-        self.rdatabase.execute(sql)
+        self.db.execute(sql)
 
 
 class DatabaseParametersPragma(DatabaseParameters):
@@ -255,18 +254,18 @@ class DatabaseParametersPragma(DatabaseParameters):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection
+        db: Database
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
+        db: Database instance.
         """
 
         # Set parameter.
-        self.rdatabase = rdatabase
+        self.db = db
 
 
     def get(self, key: str) -> str | None:
@@ -286,7 +285,7 @@ class DatabaseParametersPragma(DatabaseParameters):
         sql = f'PRAGMA %s' % key
 
         # Execute SQL.
-        result = self.rdatabase.execute(sql)
+        result = self.db.execute(sql)
         row = result.first()
         if row is None:
             variables = None
@@ -320,4 +319,4 @@ class DatabaseParametersPragma(DatabaseParameters):
         sql = ';\n'.join(sql_set_list)
 
         # Execute SQL.
-        self.rdatabase.execute(sql)
+        self.db.execute(sql)

{reydb-1.1.49.dist-info → reydb-1.1.50.dist-info}/METADATA

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

reydb-1.1.50.dist-info/RECORD

@@ -0,0 +1,17 @@
+reydb/__init__.py,sha256=vwShFPkCDpLTrVGCq1AZgKCGQ8tBBodCxrvrib9ptrs,574
+reydb/rall.py,sha256=GsXHqvT1k--U53HpDY4SALjIHN8rwgSxeXpJjH5gq2E,409
+reydb/rbase.py,sha256=A7or663TcrQyq56P813WsV4BlApZIzXOPdZLsT7KwWw,7040
+reydb/rbuild.py,sha256=8sYuqYR3jKlPfIrCwXk9o-q8cx-VNU0XsIsA6XKIKPo,31850
+reydb/rconfig.py,sha256=4vT0kKVdb9hJjHPQGtmvenPPRbtR1EP2k7jCgfPR0s8,12657
+reydb/rconn.py,sha256=IGRiOkk0TzWj-NQ2o6A1FnMqYnDvg2G1Dd-7cA0dpP0,2765
+reydb/rdb.py,sha256=Ijxja3lb73YmJfzpJBT3bQrqz9rV3TC5w2shQfwj0gQ,12919
+reydb/rerror.py,sha256=TBAzMsf7BrmelhXr5hbqOYVmmRFQtFkyC2SZQx81oYA,9941
+reydb/rexec.py,sha256=xIUbTULfmMkLBYZTPX6lyN5yob-eg6M7Xir1j3jf6PM,29071
+reydb/rfile.py,sha256=k5y3U179NED3gWdyZQ_JRuHmzFTKsZ8aMhxg04ENuHg,15180
+reydb/rinfo.py,sha256=aM3mMFwgT9pemrusS_YjXAVUCJOJ3V709bEWuB-fkuc,12737
+reydb/rorm.py,sha256=ZdXPCeflshlg-ABFpEAI7UFJWdqdBYbbi5yrCAE8Fo8,625
+reydb/rparam.py,sha256=M_tT8nesAResxoDVhk8cmG2N5woYMxXinSGIC2i_8ak,6799
+reydb-1.1.50.dist-info/METADATA,sha256=JtY5fp1zwawCi2KPhLqytLCK_ze6ZxgJ91r5fjIKmmc,1550
+reydb-1.1.50.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.50.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.50.dist-info/RECORD,,

reydb-1.1.49.dist-info/RECORD

@@ -1,16 +0,0 @@
-reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
-reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
-reydb/rbase.py,sha256=A7or663TcrQyq56P813WsV4BlApZIzXOPdZLsT7KwWw,7040
-reydb/rbuild.py,sha256=GafJ8ocDolj8OsvD9EvMZbR7hKb1WpyQv8LuQO4auKg,32083
-reydb/rconfig.py,sha256=h6L1QFtTcLgUcqzsn35lZfChcVBT0eVBzf5NOqzCUmQ,12721
-reydb/rconn.py,sha256=IGRiOkk0TzWj-NQ2o6A1FnMqYnDvg2G1Dd-7cA0dpP0,2765
-reydb/rdb.py,sha256=E6bFLCKI2f4XXatEsfKDRiZOnT42eYnvsJBV5-OyxQY,12600
-reydb/rerror.py,sha256=UcBU_EuiponHhraU2tqULcip-s5uNRnDmEQIA4IgrYc,10067
-reydb/rexec.py,sha256=xIUbTULfmMkLBYZTPX6lyN5yob-eg6M7Xir1j3jf6PM,29071
-reydb/rfile.py,sha256=OjQQRIZI-vZj0kv9Jljm4_kdp0aL005fAoTl0nAiYAg,15343
-reydb/rinfo.py,sha256=WXuN2sJtI7EK83HceLyoVXewILYtPxo9wDJFg7SQoJ8,13508
-reydb/rparam.py,sha256=6cnSjNlX54iPS1uxMQdpazPM5XL4J87vVgfL6CIYG3U,7031
-reydb-1.1.49.dist-info/METADATA,sha256=7Ae3lNDDvWlwHt4iyfsRzXkF-PlOgoEp7KL7k-U5LSg,1550
-reydb-1.1.49.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.49.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.49.dist-info/RECORD,,