reydb 1.1.56__py3-none-any.whl → 1.1.57__py3-none-any.whl

reydb/rexec.py

@@ -9,7 +9,7 @@
 """
 
 
-from typing import Any, Literal, overload
+from typing import Any, Literal, TypeVar, Generic, overload
 from collections.abc import Iterable, Generator, AsyncGenerator, Container
 from datetime import timedelta as Timedelta
 from sqlalchemy.sql.elements import TextClause
@@ -23,8 +23,8 @@ from reykit.rtable import TableData, Table
 from reykit.rtime import TimeMark, time_to
 from reykit.rwrap import wrap_runtime
 
+from . import rconn
 from .rbase import DatabaseBase, handle_sql, handle_data
-from .rconn import DatabaseConnection, DatabaseConnectionAsync
 
 
 __all__ = (
@@ -40,19 +40,22 @@ Result = Result_
 monkey_sqlalchemy_row_index_field()
 
 
-class DatabaseExecuteBase(DatabaseBase):
+DatabaseConnectionT = TypeVar('DatabaseConnectionT')
+
+
+class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
     """
-    Database execute base type.
+    Database execute super type.
     """
 
 
-    def __init__(self, dbconn: DatabaseConnection) -> None:
+    def __init__(self, dbconn: DatabaseConnectionT) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        dbconn : `DatabaseConnection` instance.
+        dbconn : `DatabaseConnection` or `DatabaseConnectionAsync`instance.
         """
 
         # Build.
@@ -74,7 +77,7 @@ class DatabaseExecuteBase(DatabaseBase):
         sql : SQL in method `sqlalchemy.text` format, or `TextClause` object.
         data : Data set for filling.
         report : Whether report SQL execute information.
-            - `None`: Use attribute `default_report`.
+            - `None`: Use attribute `Database.report`.
             - `bool`: Use this value.
         kwdata : Keyword parameters for filling.
 
@@ -84,7 +87,7 @@ class DatabaseExecuteBase(DatabaseBase):
         """
 
         # Handle parameter.
-        report = get_first_notnone(report, self.dbconn.db.default_report)
+        report = get_first_notnone(report, self.dbconn.db.report)
         sql = handle_sql(sql)
         if data is None:
             if kwdata == {}:
@@ -640,25 +643,12 @@ class DatabaseExecuteBase(DatabaseBase):
         return sql
 
 
-class DatabaseExecute(DatabaseExecuteBase):
+class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
     """
     Database execute type.
     """
 
 
-    def __init__(self, dbconn: DatabaseConnection) -> None:
-        """
-        Build instance attributes.
-
-        Parameters
-        ----------
-        dbconn : `DatabaseConnection` instance.
-        """
-
-        # Build.
-        self.dbconn = dbconn
-
-
     def execute(
         self,
         sql: str | TextClause,
@@ -674,7 +664,7 @@ class DatabaseExecute(DatabaseExecuteBase):
         sql : SQL in method `sqlalchemy.text` format, or `TextClause` object.
         data : Data set for filling.
         report : Whether report SQL execute information.
-            - `None`: Use attribute `default_report`.
+            - `None`: Use attribute `Database.report`.
             - `bool`: Use this value.
         kwdata : Keyword parameters for filling.
 
@@ -756,8 +746,7 @@ class DatabaseExecute(DatabaseExecuteBase):
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
 
         Returns
@@ -809,8 +798,7 @@ class DatabaseExecute(DatabaseExecuteBase):
             - `update`: Use `ON DUPLICATE KEY UPDATE` clause and update all fields.
             - `Container[str]`: Use `ON DUPLICATE KEY UPDATE` clause and update this fields.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
             - `str and first character is ':'`: Use this syntax.
             - `Any`: Use this value.
@@ -868,8 +856,7 @@ class DatabaseExecute(DatabaseExecuteBase):
             - `str`: This key value pair of each item is judged.
             - `Iterable[str]`: Multiple judged, `and`: relationship.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
             - `str and first character is ':'`: Use this syntax.
             - `Any`: Use this value.
@@ -919,8 +906,7 @@ class DatabaseExecute(DatabaseExecuteBase):
         order : Clause `ORDER BY` content, join as `ORDER BY str`.
         limit : Clause `LIMIT` content, join as `LIMIT int/str`.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
 
         Returns
@@ -965,8 +951,7 @@ class DatabaseExecute(DatabaseExecuteBase):
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
             - `In 'WHERE' syntax`: Fill 'WHERE' syntax.
             - `Not in 'WHERE' syntax`: Fill 'INSERT' and 'SELECT' syntax.
@@ -1013,8 +998,7 @@ class DatabaseExecute(DatabaseExecuteBase):
             - `None`: Match all.
             - `str`: Match condition.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
 
         Returns
@@ -1055,8 +1039,7 @@ class DatabaseExecute(DatabaseExecuteBase):
             - `None`: Match all.
             - `str`: Match condition.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
 
         Returns
@@ -1099,7 +1082,7 @@ class DatabaseExecute(DatabaseExecuteBase):
         sql : SQL in method `sqlalchemy.text` format, or `TextClause` object.
         data : Data set for filling.
         report : Whether report SQL execute information.
-            - `None`: Use attribute `default_report`.
+            - `None`: Use attribute `Database.report`.
             - `bool`: Use this value.
         kwdata : Keyword parameters for filling.
 
@@ -1158,7 +1141,7 @@ class DatabaseExecute(DatabaseExecuteBase):
             - `None`: Set to Maximum decimal digits of element of parameter `thresholds`.
             - `int`: Set to this value.
         report : Whether report SQL execute information.
-            - `None`: Use attribute `default_report`.
+            - `None`: Use attribute `Database.report`.
             - `bool`: Use this value.
 
         Returns
@@ -1181,25 +1164,12 @@ class DatabaseExecute(DatabaseExecuteBase):
         return second
 
 
-class DatabaseExecuteAsync(DatabaseExecuteBase):
+class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']):
     """
     Asynchronous database execute type.
     """
 
 
-    def __init__(self, dbconn: DatabaseConnectionAsync) -> None:
-        """
-        Build instance attributes.
-
-        Parameters
-        ----------
-        dbconn : `DatabaseConnectionAsync` instance.
-        """
-
-        # Build.
-        self.dbconn = dbconn
-
-
     async def execute(
         self,
         sql: str | TextClause,
@@ -1215,7 +1185,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
         sql : SQL in method `sqlalchemy.text` format, or `TextClause` object.
         data : Data set for filling.
         report : Whether report SQL execute information.
-            - `None`: Use attribute `default_report`.
+            - `None`: Use attribute `DatabaseAsync.report`.
             - `bool`: Use this value.
         kwdata : Keyword parameters for filling.
 
@@ -1236,7 +1206,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
         if report:
             tm = TimeMark()
             tm()
-            result = await self.dbconn.aconn.execute(sql, data)
+            result = await self.dbconn.conn.execute(sql, data)
             tm()
 
             ### Generate report.
@@ -1268,7 +1238,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
 
         ## Not report.
         else:
-            result = await self.dbconn.aconn.execute(sql, data)
+            result = await self.dbconn.conn.execute(sql, data)
 
         # Automatic commit.
         if self.dbconn.autocommit:
@@ -1314,8 +1284,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
 
         Returns
@@ -1367,8 +1336,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
             - `update`: Use `ON DUPLICATE KEY UPDATE` clause and update all fields.
             - `Container[str]`: Use `ON DUPLICATE KEY UPDATE` clause and update this fields.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
             - `str and first character is ':'`: Use this syntax.
             - `Any`: Use this value.
@@ -1426,8 +1394,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
             - `str`: This key value pair of each item is judged.
             - `Iterable[str]`: Multiple judged, `and`: relationship.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
             - `str and first character is ':'`: Use this syntax.
             - `Any`: Use this value.
@@ -1477,8 +1444,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
         order : Clause `ORDER BY` content, join as `ORDER BY str`.
         limit : Clause `LIMIT` content, join as `LIMIT int/str`.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
 
         Returns
@@ -1523,8 +1489,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
             - `In 'WHERE' syntax`: Fill 'WHERE' syntax.
             - `Not in 'WHERE' syntax`: Fill 'INSERT' and 'SELECT' syntax.
@@ -1571,8 +1536,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
             - `None`: Match all.
             - `str`: Match condition.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
 
         Returns
@@ -1613,8 +1577,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
             - `None`: Match all.
             - `str`: Match condition.
         report : Whether report SQL execute information.
-            - `None`, Use attribute `report_execute_info`: of object `ROption`.
-            - `int`: Use this value.
+            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
 
         Returns
@@ -1657,7 +1620,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
         sql : SQL in method `sqlalchemy.text` format, or `TextClause` object.
         data : Data set for filling.
         report : Whether report SQL execute information.
-            - `None`: Use attribute `default_report`.
+            - `None`: Use attribute `DatabaseAsync.report`.
             - `bool`: Use this value.
         kwdata : Keyword parameters for filling.
 
@@ -1716,7 +1679,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
             - `None`: Set to Maximum decimal digits of element of parameter `thresholds`.
             - `int`: Set to this value.
         report : Whether report SQL execute information.
-            - `None`: Use attribute `default_report`.
+            - `None`: Use attribute `DatabaseAsync.report`.
             - `bool`: Use this value.
 
         Returns

reydb/rfile.py

@@ -13,8 +13,8 @@ from typing import TypedDict, overload
 from datetime import datetime
 from reykit.ros import File, Folder, get_md5
 
+from . import rdb
 from .rbase import DatabaseBase
-from .rdb import Database
 
 
 __all__ = (
@@ -32,7 +32,7 @@ class DatabaseFile(DatabaseBase):
     """
 
 
-    def __init__(self, db: Database) -> None:
+    def __init__(self, db: 'rdb.Database') -> None:
         """
         Build instance attributes.
 

reydb/rinfo.py

@@ -11,8 +11,8 @@
 
 from typing import Any, Literal, overload
 
+from . import rdb
 from .rbase import DatabaseBase
-from .rdb import Database
 
 
 __all__ = (
@@ -190,7 +190,7 @@ class DatabaseInformationSchema(DatabaseInformation):
 
     def __init__(
         self,
-        db: Database
+        db: 'rdb.Database'
     ) -> None:
         """
         Build instance attributes.
@@ -253,7 +253,7 @@ class DatabaseInformationDatabase(DatabaseInformation):
 
     def __init__(
         self,
-        db: Database,
+        db: 'rdb.Database',
         database: str
     ) -> None:
         """
@@ -348,7 +348,7 @@ class DatabaseInformationTable(DatabaseInformation):
 
     def __init__(
         self,
-        db: Database,
+        db: 'rdb.Database',
         database: str,
         table: str
     ) -> None:
@@ -442,7 +442,7 @@ class DatabaseInformationColumn(DatabaseInformation):
 
     def __init__(
         self,
-        db: Database,
+        db: 'rdb.Database',
         database: str,
         table: str,
         column: str

reydb/rorm.py

@@ -22,8 +22,8 @@ from sqlmodel.main import SQLModelMetaclass, FieldInfo
 from sqlmodel.sql._expression_select_cls import SelectOfScalar as Select
 from reykit.rbase import CallableT, Null, is_instance
 
+from . import rdb
 from .rbase import DatabaseBase
-from .rdb import Database
 
 
 __all__ = (
@@ -89,7 +89,7 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
                 sa_column_kwargs: dict = field.sa_column_kwargs
                 sa_column_kwargs.setdefault('name', __name__)
 
-        # Base.
+        # Super.
         new_cls = super().__new__(cls, name, bases, attrs, **kwargs)
 
         return new_cls
@@ -347,7 +347,7 @@ class DatabaseORMModelField(DatabaseBase, FieldInfo):
         if 'comment' in kwargs:
             kwargs['sa_column_kwargs']['comment'] = kwargs.pop('comment')
 
-        # Base.
+        # Super.
         super().__init__(**kwargs)
 
 
@@ -369,7 +369,7 @@ class DatabaseORM(DatabaseORMBase):
     wrap_validate_model = pydantic_model_validator
 
 
-    def __init__(self, db: Database) -> None:
+    def __init__(self, db: 'rdb.Database') -> None:
         """
         Build instance attributes.
 
@@ -403,7 +403,7 @@ class DatabaseORM(DatabaseORMBase):
         """
 
         # Build.
-        sess = DataBaseORMSession(self, autocommit)
+        sess = DatabaseORMSession(self, autocommit)
 
         return sess
 
@@ -456,7 +456,7 @@ class DatabaseORM(DatabaseORMBase):
                 table.drop(self.db.engine, checkfirst=skip)
 
 
-class DataBaseORMSession(DatabaseORMBase):
+class DatabaseORMSession(DatabaseORMBase):
     """
     Database ORM session type, based ORM model.
     """
@@ -569,7 +569,7 @@ class DataBaseORMSession(DatabaseORMBase):
 
         # Define.
         @functools_wraps(method)
-        def wrap(self: 'DataBaseORMSession', *args, **kwargs):
+        def wrap(self: 'DatabaseORMSession', *args, **kwargs):
 
             # Session.
             if self.session is None:
@@ -889,7 +889,7 @@ class DatabaseORMStatement(DatabaseORMBase):
 
     def __init__(
         self,
-        sess: DataBaseORMSession,
+        sess: DatabaseORMSession,
         model: Type[ModelT]
     ) -> None:
         """
@@ -901,7 +901,7 @@ class DatabaseORMStatement(DatabaseORMBase):
         model : ORM model instance.
         """
 
-        # Base.
+        # Super.
         super().__init__(self.model)
 
         # Build.

reydb/rparam.py

@@ -11,8 +11,8 @@
 
 from typing import overload
 
+from . import rdb
 from .rbase import DatabaseBase
-from .rdb import Database
 
 
 __all__ = (
@@ -31,7 +31,7 @@ class DatabaseParameters(DatabaseBase):
 
     def __init__(
         self,
-        db: Database,
+        db: 'rdb.Database',
         global_: bool
     ) -> None:
         """
@@ -254,7 +254,7 @@ class DatabaseParametersPragma(DatabaseParameters):
 
     def __init__(
         self,
-        db: Database
+        db: 'rdb.Database'
     ) -> None:
         """
         Build instance attributes.

{reydb-1.1.56.dist-info → reydb-1.1.57.dist-info}/METADATA

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

reydb-1.1.57.dist-info/RECORD

@@ -0,0 +1,17 @@
+reydb/__init__.py,sha256=h6duExQWsPCz3qKnTIHTslmqcBC63HCQvwiumg8oCVc,620
+reydb/rall.py,sha256=GsXHqvT1k--U53HpDY4SALjIHN8rwgSxeXpJjH5gq2E,409
+reydb/rbase.py,sha256=oMxftAVOPrX-8EcIzBUpTZ2aVbMJzxBkMlgjJN1Ilv0,9344
+reydb/rbuild.py,sha256=6K6u8GKECiYakvJ0mmQJduwN4oDLnBS6S0A1AG5A4fA,31850
+reydb/rconfig.py,sha256=OGVv6JT3_hN1nxI4B0oxC8281_vMQxjQbLjxGEDP5LE,12657
+reydb/rconn.py,sha256=N9KzvhG_1b_e0vXSfifFV2Yq2Tf2QFAsHQcCOZglGlI,6534
+reydb/rdb.py,sha256=cxacqHUegl_30NQRXSCMtqFrUCACye-Nt_pteU4Mw3Y,13187
+reydb/rerror.py,sha256=5n0poj6uLpKwmvlXVvfsFMqJ9NuVJ1HshoJgC8yQxLs,9941
+reydb/rexec.py,sha256=-Oo1qnK4gjWlGqvYz8zYyack1QySGQZcv5SApVp-EQU,52840
+reydb/rfile.py,sha256=VcjQtsH-xQbWFkk0gpJ8s66jYxwAfiAJkHJ-V-5jQIw,15182
+reydb/rinfo.py,sha256=jvFzK-zO2PP1ph7lo12tsvkP8cshoRe4rPdq0DiU44g,12757
+reydb/rorm.py,sha256=NiJoub0Ixm2TVCTajq6ktM3Oj5VQ2WBfoyn-QBGO6OQ,23694
+reydb/rparam.py,sha256=XqVQa_026dtpwuGDgJIm9Rtgd2pB34h3TL8cFKmf3uw,6807
+reydb-1.1.57.dist-info/METADATA,sha256=-rJlF25mWNFLY3I6njiz9YMEr0w6jLG5jRmW4Dp_9SY,1598
+reydb-1.1.57.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.57.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.57.dist-info/RECORD,,

reydb-1.1.56.dist-info/RECORD

@@ -1,17 +0,0 @@
-reydb/__init__.py,sha256=vwShFPkCDpLTrVGCq1AZgKCGQ8tBBodCxrvrib9ptrs,574
-reydb/rall.py,sha256=GsXHqvT1k--U53HpDY4SALjIHN8rwgSxeXpJjH5gq2E,409
-reydb/rbase.py,sha256=rgAkEHLXDoMfiNCN2ckPQD-Eyd1tp0f122LEbI7L1Qg,8947
-reydb/rbuild.py,sha256=6N8aLqCeX8JnOwQstVA2AuM0Rl5kUHx5Enrm2GGcGvo,31852
-reydb/rconfig.py,sha256=UTpJ9psCrQlFx3FJ5_B8WkURRQ5PD6ZHLYg7MQRebmU,12659
-reydb/rconn.py,sha256=VgzoI5gMHi5yMyUpLsPuMmuFkYDHCc0uuRXh_yUPY94,6551
-reydb/rdb.py,sha256=p0JOcuA1peG9aZ1FIDMZ6z7-PY5_Pup-OM291NUIl28,15937
-reydb/rerror.py,sha256=Lsl7UECYdIFYjd9t7RhvNcHdyGStI3gffm8zmkK1DEc,9943
-reydb/rexec.py,sha256=sTb9IOldf6USK-Qo9xV03wHlniU7xAQHYZZKT3B0jPA,54099
-reydb/rfile.py,sha256=RI1jMsNNJWvdky3oRV1Gw-9-tc1F92QjD24s2eusCVI,15184
-reydb/rinfo.py,sha256=4btKBBZzVXGuPsmswqXDxvjZQuAc9raQ0tpXvmft71s,12741
-reydb/rorm.py,sha256=JUwKZ9OgrI_FvTwTDfZhozpJB1v1xk_o3ESPLGTXXYI,23693
-reydb/rparam.py,sha256=six7wwQRKycoscv-AGyQqsPjA4_TZgcGQ_jk7FZytQs,6803
-reydb-1.1.56.dist-info/METADATA,sha256=9jzfWPm0Mi2zoM-j6JG8XC0NWfjl9HfcN87p5IIIFeU,1598
-reydb-1.1.56.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.56.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.56.dist-info/RECORD,,