reydb 1.2.19__py3-none-any.whl → 1.2.20__py3-none-any.whl

reydb/rexec.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2025-09-22 22:12:33
+@Time    : 2025-09-22
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Execute methods.
@@ -87,7 +87,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         """
 
         # Parameter.
-        echo = get_first_notnone(echo, self.conn.db.echo)
+        echo = get_first_notnone(echo, self.conn.engine.echo)
         sql = handle_sql(sql)
         if data is None:
             if kwdata == {}:
@@ -143,7 +143,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         # Parameter.
         if type(path) == str:
-            database, table = self.conn.db.database, path
+            database, table = self.conn.engine.database, path
         else:
             database, table = path
 
@@ -241,7 +241,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         # Parameter.
         if type(path) == str:
-            database, table = self.conn.db.database, path
+            database, table = self.conn.engine.database, path
         else:
             database, table = path
 
@@ -384,7 +384,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         # Parameter.
         if type(path) == str:
-            database, table = self.conn.db.database, path
+            database, table = self.conn.engine.database, path
         else:
             database, table = path
 
@@ -518,7 +518,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         # Parameter.
         if type(path) == str:
-            database, table = self.conn.db.database, path
+            database, table = self.conn.engine.database, path
         else:
             database, table = path
 
@@ -581,7 +581,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         # Parameter.
         if type(path) == str:
-            database, table = self.conn.db.database, path
+            database, table = self.conn.engine.database, path
         else:
             database, table = path
         if fields is None:
@@ -1236,7 +1236,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         if self.conn.autocommit:
             await self.conn.commit()
             await self.conn.close()
-            await self.conn.db.dispose()
+            await self.conn.engine.dispose()
 
         return result
 

reydb/rinfo.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2022-12-05 14:10:02
+@Time    : 2022-12-05
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Database information methods.
@@ -11,7 +11,7 @@
 
 from typing import Literal, TypeVar, Generic, Final, overload
 
-from . import rdb
+from . import rengine
 from .rbase import DatabaseBase
 from .rexec import Result
 
@@ -35,7 +35,7 @@ __all__ = (
 )
 
 
-DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
+DatabaseEngineT = TypeVar('DatabaseEngineT', 'rengine.DatabaseEngine', 'rengine.DatabaseEngineAsync')
 
 
 class DatabaseInformationBase(DatabaseBase):
@@ -44,23 +44,23 @@ class DatabaseInformationBase(DatabaseBase):
     """
 
 
-class DatabaseInformationSchemaSuper(DatabaseInformationBase, Generic[DatabaseT]):
+class DatabaseInformationSchemaSuper(DatabaseInformationBase, Generic[DatabaseEngineT]):
     """
     Database information schema super type.
     """
 
 
-    def __init__(self, db: DatabaseT) -> None:
+    def __init__(self, engine: DatabaseEngineT) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        db: Database instance.
+        engine: Database engine.
         """
 
         # Parameter.
-        self.db = db
+        self.engine = engine
 
     def handle_before__call__(self, filter_default: bool = True) -> tuple[str, tuple[str, ...]]:
         """
@@ -214,7 +214,7 @@ class DatabaseInformationSchemaSuper(DatabaseInformationBase, Generic[DatabaseT]
         return judge
 
 
-class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
+class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rengine.DatabaseEngine']):
     """
     Database information schema type.
     """
@@ -235,14 +235,14 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
 
         # Get.
         sql, filter_db = self.handle_before__call__(filter_default)
-        result = self.db.execute(sql, filter_db=filter_db)
+        result = self.engine.execute(sql, filter_db=filter_db)
         schema = self.handle_after__call__(result)
 
         # Cache.
-        if self.db._schema is None:
-            self.db._schema = schema
+        if self.engine._schema is None:
+            self.engine._schema = schema
         else:
-            self.db._schema.update(schema)
+            self.engine._schema.update(schema)
 
         return schema
 
@@ -301,9 +301,9 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
         # Parameter.
         if (
             cache
-            and self.db._schema is not None
+            and self.engine._schema is not None
         ):
-            schema = self.db._schema
+            schema = self.engine._schema
         else:
             schema = self.schema()
 
@@ -313,7 +313,7 @@ class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
         return result
 
 
-class DatabaseInformationSchemaAsync(DatabaseInformationSchemaSuper['rdb.DatabaseAsync']):
+class DatabaseInformationSchemaAsync(DatabaseInformationSchemaSuper['rengine.DatabaseEngineAsync']):
     """
     Asynchronous database information schema type.
     """
@@ -334,12 +334,12 @@ class DatabaseInformationSchemaAsync(DatabaseInformationSchemaSuper['rdb.Databas
 
         # Get.
         sql, filter_db = self.handle_before__call__(filter_default)
-        result = await self.db.execute(sql, filter_db=filter_db)
+        result = await self.engine.execute(sql, filter_db=filter_db)
         schema = self.handle_after__call__(result)
 
         # Cache.
-        if self.db._schema is not None:
-            self.db._schema.update(schema)
+        if self.engine._schema is not None:
+            self.engine._schema.update(schema)
 
         return schema
 
@@ -398,11 +398,11 @@ class DatabaseInformationSchemaAsync(DatabaseInformationSchemaSuper['rdb.Databas
         # Parameter.
         if (
             refresh
-            or self.db._schema is None
+            or self.engine._schema is None
         ):
             schema = await self.schema()
         else:
-            schema = self.db._schema
+            schema = self.engine._schema
 
         # Judge.
         result = self.handle_exist(schema, database, table, column)
@@ -410,7 +410,7 @@ class DatabaseInformationSchemaAsync(DatabaseInformationSchemaSuper['rdb.Databas
         return result
 
 
-class DatabaseInformationParameterSuper(DatabaseInformationBase, Generic[DatabaseT]):
+class DatabaseInformationParameterSuper(DatabaseInformationBase, Generic[DatabaseEngineT]):
     """
     Database information parameters super type.
     """
@@ -421,21 +421,21 @@ class DatabaseInformationParameterSuper(DatabaseInformationBase, Generic[Databas
 
     def __init__(
         self,
-        db: DatabaseT
+        engine: DatabaseEngineT
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        db: Database instance.
+        engine: Database engine.
         """
 
         # Parameter.
-        self.db = db
+        self.engine = engine
 
 
-class DatabaseInformationParameter(DatabaseInformationParameterSuper['rdb.Database']):
+class DatabaseInformationParameter(DatabaseInformationParameterSuper['rengine.DatabaseEngine']):
     """
     Database information parameters type.
     """
@@ -509,13 +509,13 @@ class DatabaseInformationParameter(DatabaseInformationParameterSuper['rdb.Databa
 
         ## Dictionary.
         if key is None:
-            result = self.db.execute(sql, key=key)
+            result = self.engine.execute(sql, key=key)
             status = result.to_dict(val_field=1)
 
         ## Value.
         else:
             sql += ' LIKE :key'
-            result = self.db.execute(sql, key=key)
+            result = self.engine.execute(sql, key=key)
             row = result.first()
             if row is None:
                 status = None
@@ -554,10 +554,10 @@ class DatabaseInformationParameter(DatabaseInformationParameterSuper['rdb.Databa
         ) + sql_set
 
         # Execute SQL.
-        self.db.execute(sql)
+        self.engine.execute(sql)
 
 
-class DatabaseInformationParameterAsync(DatabaseInformationParameterSuper['rdb.DatabaseAsync']):
+class DatabaseInformationParameterAsync(DatabaseInformationParameterSuper['rengine.DatabaseEngineAsync']):
     """
     Asynchronous database information parameters type.
     """
@@ -631,13 +631,13 @@ class DatabaseInformationParameterAsync(DatabaseInformationParameterSuper['rdb.D
 
         ## Dictionary.
         if key is None:
-            result = await self.db.execute(sql, key=key)
+            result = await self.engine.execute(sql, key=key)
             status = result.to_dict(val_field=1)
 
         ## Value.
         else:
             sql += ' LIKE :key'
-            result = await self.db.execute(sql, key=key)
+            result = await self.engine.execute(sql, key=key)
             row = result.first()
             if row is None:
                 status = None
@@ -680,7 +680,7 @@ class DatabaseInformationParameterAsync(DatabaseInformationParameterSuper['rdb.D
         ) + sql_set
 
         # Execute SQL.
-        await self.db.execute(sql)
+        await self.engine.execute(sql)
 
 
 class DatabaseInformationParameterVariables(DatabaseInformationParameter):

reydb/rorm.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2025-09-23 00:50:32
+@Time    : 2025-09-23
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Database ORM methods.
@@ -32,7 +32,7 @@ from datetime import datetime, date, time, timedelta
 from warnings import filterwarnings
 from reykit.rbase import CallableT, Null, throw, is_instance
 
-from . import rdb
+from . import rengine
 from .rbase import (
     SessionT,
     SessionTransactionT,
@@ -69,7 +69,7 @@ __all__ = (
 )
 
 
-DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
+DatabaseEngineT = TypeVar('DatabaseEngineT', 'rengine.DatabaseEngine', 'rengine.DatabaseEngineAsync')
 DatabaseORMModelT = TypeVar('DatabaseORMModelT', bound='DatabaseORMModel')
 DatabaseORMT = TypeVar('DatabaseORMT', 'DatabaseORM', 'DatabaseORMAsync')
 DatabaseORMSessionT = TypeVar('DatabaseORMSessionT', 'DatabaseORMSession', 'DatabaseORMSessionAsync')
@@ -504,23 +504,23 @@ class DatabaseORMModelMethod(DatabaseORMBase):
         return instance
 
 
-class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseT, DatabaseORMSessionT]):
+class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseEngineT, DatabaseORMSessionT]):
     """
     Database ORM super type.
     """
 
 
-    def __init__(self, db: DatabaseT) -> None:
+    def __init__(self, engine: DatabaseEngineT) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        db: Database instance.
+        engine: Database engine.
         """
 
         # Build.
-        self.db = db
+        self.engine = engine
         self.__sess = self.session(True)
 
         ## Method.
@@ -559,13 +559,13 @@ class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseT, DatabaseORMSessionT])
         return sess
 
 
-class DatabaseORM(DatabaseORMSuper['rdb.Database', 'DatabaseORMSession']):
+class DatabaseORM(DatabaseORMSuper['rengine.DatabaseEngine', 'DatabaseORMSession']):
     """
     Database ORM type.
     """
 
 
-class DatabaseORMAsync(DatabaseORMSuper['rdb.DatabaseAsync', 'DatabaseORMSessionAsync']):
+class DatabaseORMAsync(DatabaseORMSuper['rengine.DatabaseEngineAsync', 'DatabaseORMSessionAsync']):
     """
     Asynchronous database ORM type.
     """
@@ -777,7 +777,7 @@ class DatabaseORMSession(
 
         # Create.
         if self.session is None:
-            self.session = Session(self.orm.db.engine)
+            self.session = Session(self.orm.engine.engine)
 
         return self.session
 
@@ -863,7 +863,7 @@ class DatabaseORMSession(
 
             # Session.
             if self.session is None:
-                self.session = Session(self.orm.db.engine)
+                self.session = Session(self.orm.engine.engine)
 
             # Begin.
             if self.begin is None:
@@ -909,7 +909,7 @@ class DatabaseORMSession(
             throw(ValueError, tables)
 
         # Create.
-        metadata.create_all(self.orm.db.engine, tables, skip)
+        metadata.create_all(self.orm.engine.engine, tables, skip)
 
 
     @wrap_transact
@@ -938,7 +938,7 @@ class DatabaseORMSession(
             throw(ValueError, tables)
 
         # Drop.
-        metadata.drop_all(self.orm.db.engine, tables, skip)
+        metadata.drop_all(self.orm.engine.engine, tables, skip)
 
 
     @wrap_transact
@@ -1144,7 +1144,7 @@ class DatabaseORMSessionAsync(
 
         # Close.
         await self.close()
-        await self.orm.db.dispose()
+        await self.orm.engine.dispose()
 
 
     def get_sess(self) -> AsyncSession:
@@ -1158,7 +1158,7 @@ class DatabaseORMSessionAsync(
 
         # Create.
         if self.session is None:
-            self.session = AsyncSession(self.orm.db.engine)
+            self.session = AsyncSession(self.orm.engine.engine)
 
         return self.session
 
@@ -1255,7 +1255,7 @@ class DatabaseORMSessionAsync(
             if self.autocommit:
                 await self.commit()
                 await self.close()
-                await self.orm.db.dispose()
+                await self.orm.engine.dispose()
 
             return result
 
@@ -1597,7 +1597,7 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
 
             await self.sess.commit()
             await self.sess.close()
-            await self.sess.orm.db.dispose()
+            await self.sess.orm.engine.dispose()
 
         return result
 

{reydb-1.2.19.dist-info → reydb-1.2.20.dist-info}/METADATA

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

reydb-1.2.20.dist-info/RECORD

@@ -0,0 +1,16 @@
+reydb/__init__.py,sha256=BnJsTzcwqeQ8-5Boqsehgcpc1eSDkv41v0kdb10gAgM,643
+reydb/rall.py,sha256=5GI0yuwF72XypNZ1DYIxKizo2Z5pR88Uv0nUpHKYhCk,379
+reydb/rbase.py,sha256=S3ip2PxvLn2Spgv5G_xd7xgC-U4wjEoAZ7Up25ZQvLk,8223
+reydb/rbuild.py,sha256=6ZkU3LGkIk04KTPtd8fgTC4pX93p1tvbOhZWWEi-v5A,40846
+reydb/rconfig.py,sha256=oOYGqhFzWVPx57D-Bbw6B2F9VmqGc_Y-aTy-mJd0Cgk,18163
+reydb/rconn.py,sha256=K_k6cJ94yrPIFaSZ06enpguTWVPhDu67LHan41C1bRA,7023
+reydb/rdb.py,sha256=X3ZScVFnPAm6Cqmsx13CCumQH3ZwEQcL4UqpoY42APg,2708
+reydb/rengine.py,sha256=CoUh0n5ZG1oRdbcTqCl-s8R8ePXJtIxDg79E6dGx2dU,15644
+reydb/rerror.py,sha256=M7RPXwywLYl5Vew7jfXxUxVnBrM1b_T6V9Izt4B8zI0,14791
+reydb/rexec.py,sha256=hZe5SRbqo_aTpuB1vI2HXVx1FjtwvKGLRom3uzjTuqI,52949
+reydb/rinfo.py,sha256=c5otyOikGMVnLFhPbtlgmnFBRR3NMP7xcmMW-LQdaQk,18314
+reydb/rorm.py,sha256=mnfVf6fulTJ84EyjFqYijdAwdwaybBVvyZKNG4EhbwU,50065
+reydb-1.2.20.dist-info/METADATA,sha256=3WSGgIL7ScE69ImeI9ma3zezy-rgNmZ0dxe1a1WPr1k,1647
+reydb-1.2.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.20.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.20.dist-info/RECORD,,

reydb-1.2.19.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=0cpV7nZM21KtcG90U9Q8gjNBOKhc-ShwSH5wh99l94o,40597
-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=vCNTH6bAg_3Hg8E6nOGDSZ82sZq6gkiQI5rds_hJbV4,49960
-reydb-1.2.19.dist-info/METADATA,sha256=VCP-3YkgjexOuDjSYs7IGMhe85qzX_3pbLiQRCUjayA,1647
-reydb-1.2.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.19.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.19.dist-info/RECORD,,