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

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')
@@ -303,11 +303,9 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
             kwargs['alias'] = kwargs['sa_column_kwargs']['name'] = kwargs.pop('field_name')
 
         ## Key auto.
-        if kwargs.get('key_auto'):
-            kwargs['sa_column_kwargs']['autoincrement'] = True
+        if kwargs.pop('key_auto', False):
             kwargs['primary_key'] = True
-        else:
-            kwargs['sa_column_kwargs']['autoincrement'] = False
+            kwargs['sa_column_kwargs']['autoincrement'] = True
 
         ## Key.
         if kwargs.get('primary_key'):
@@ -336,7 +334,11 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
         ## Argument default.
         arg_default = kwargs.pop('arg_default', Null)
         if arg_default == Null:
-            if kwargs['nullable']:
+            if (
+                kwargs['nullable']
+                or kwargs['sa_column_kwargs'].get('autoincrement')
+                or kwargs['sa_column_kwargs'].get('server_default') is not None
+            ):
                 kwargs['default'] = None
         elif callable(arg_default):
             kwargs['default_factory'] = arg_default
@@ -502,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.
@@ -557,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.
     """
@@ -603,7 +605,7 @@ class DatabaseORMSessionSuper(
         # Build.
         self.orm = orm
         self.autocommit = autocommit
-        self.sess: SessionT | None = None
+        self.session: SessionT | None = None
         self.begin: SessionTransactionT | None = None
 
 
@@ -774,10 +776,10 @@ class DatabaseORMSession(
         """
 
         # Create.
-        if self.sess is None:
-            self.sess = Session(self.orm.db.engine)
+        if self.session is None:
+            self.session = Session(self.orm.engine.engine)
 
-        return self.sess
+        return self.session
 
 
     def get_begin(self) -> SessionTransaction:
@@ -828,9 +830,18 @@ class DatabaseORMSession(
         if self.begin is not None:
             self.begin.close()
             self.begin = None
-        if self.sess is not None:
-            self.sess.close()
-            self.sess = None
+        if self.session is not None:
+            self.session.close()
+            self.session = None
+
+
+    def flush(self) -> None:
+        """
+        Send execution to database, can refresh increment primary key attribute value of model.
+        """
+
+        # Send.
+        self.session.flush()
 
 
     def wrap_transact(method: CallableT) -> CallableT:
@@ -847,17 +858,16 @@ class DatabaseORMSession(
         """
 
 
-        # Define.
         @functools_wraps(method)
         def wrap(self: 'DatabaseORMSession', *args, **kwargs):
 
             # Session.
-            if self.sess is None:
-                self.sess = Session(self.orm.db.engine)
+            if self.session is None:
+                self.session = Session(self.orm.engine.engine)
 
             # Begin.
             if self.begin is None:
-                self.begin = self.sess.begin()
+                self.begin = self.session.begin()
 
             # Execute.
             result = method(self, *args, **kwargs)
@@ -899,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
@@ -928,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
@@ -953,14 +963,14 @@ class DatabaseORMSession(
             model = type(model)
 
         # Get.
-        result = self.sess.get(model, key)
+        result = self.session.get(model, key)
 
         # Autucommit.
         if (
             self.autocommit
             and result is not None
         ):
-            self.sess.expunge(result)
+            self.session.expunge(result)
 
         return result
 
@@ -990,7 +1000,7 @@ class DatabaseORMSession(
         results = [
             result
             for key in keys
-            if (result := self.sess.get(model, key)) is not None
+            if (result := self.session.get(model, key)) is not None
         ]
 
         return results
@@ -1016,7 +1026,7 @@ class DatabaseORMSession(
 
         # Get.
         select = Select(model)
-        models = self.sess.exec(select)
+        models = self.session.exec(select)
         models = list(models)
 
         return models
@@ -1033,7 +1043,7 @@ class DatabaseORMSession(
         """
 
         # Add.
-        self.sess.add_all(models)
+        self.session.add_all(models)
 
 
     @wrap_transact
@@ -1048,7 +1058,7 @@ class DatabaseORMSession(
 
         # Delete.
         for model in models:
-            self.sess.delete(model)
+            self.session.delete(model)
 
 
     @wrap_transact
@@ -1063,7 +1073,7 @@ class DatabaseORMSession(
 
         # Refresh.
         for model in models:
-            self.sess.refresh(model)
+            self.session.refresh(model)
 
 
     @wrap_transact
@@ -1078,7 +1088,7 @@ class DatabaseORMSession(
 
         # Refresh.
         for model in models:
-            self.sess.expire(model)
+            self.session.expire(model)
 
 
     @overload
@@ -1134,7 +1144,7 @@ class DatabaseORMSessionAsync(
 
         # Close.
         await self.close()
-        await self.orm.db.dispose()
+        await self.orm.engine.dispose()
 
 
     def get_sess(self) -> AsyncSession:
@@ -1147,10 +1157,10 @@ class DatabaseORMSessionAsync(
         """
 
         # Create.
-        if self.sess is None:
-            self.sess = AsyncSession(self.orm.db.engine)
+        if self.session is None:
+            self.session = AsyncSession(self.orm.engine.engine)
 
-        return self.sess
+        return self.session
 
 
     async def get_begin(self) -> AsyncSessionTransaction:
@@ -1201,9 +1211,18 @@ class DatabaseORMSessionAsync(
         if self.begin is not None:
             await self.begin.rollback()
             self.begin = None
-        if self.sess is not None:
-            await self.sess.close()
-            self.sess = None
+        if self.session is not None:
+            await self.session.close()
+            self.session = None
+
+
+    async def flush(self) -> None:
+        """
+        Asynchronous send execution to database, can refresh increment primary key attribute value of model.
+        """
+
+        # Send.
+        await self.session.flush()
 
 
     def wrap_transact(method: CallableT) -> CallableT:
@@ -1220,7 +1239,6 @@ class DatabaseORMSessionAsync(
         """
 
 
-        # Define.
         @functools_wraps(method)
         async def wrap(self: 'DatabaseORMSessionAsync', *args, **kwargs):
 
@@ -1237,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
 
@@ -1271,7 +1289,7 @@ class DatabaseORMSessionAsync(
             throw(ValueError, tables)
 
         # Create.
-        conn = await self.sess.connection()
+        conn = await self.session.connection()
         await conn.run_sync(metadata.create_all, tables, skip)
 
 
@@ -1301,7 +1319,7 @@ class DatabaseORMSessionAsync(
             throw(ValueError, tables)
 
         # Drop.
-        conn = await self.sess.connection()
+        conn = await self.session.connection()
         await conn.run_sync(metadata.drop_all, tables, skip)
 
 
@@ -1327,14 +1345,14 @@ class DatabaseORMSessionAsync(
             model = type(model)
 
         # Get.
-        result = await self.sess.get(model, key)
+        result = await self.session.get(model, key)
 
         # Autucommit.
         if (
             self.autocommit
             and result is not None
         ):
-            self.sess.expunge(result)
+            self.session.expunge(result)
 
         return result
 
@@ -1364,7 +1382,7 @@ class DatabaseORMSessionAsync(
         results = [
             result
             for key in keys
-            if (result := await self.sess.get(model, key)) is not None
+            if (result := await self.session.get(model, key)) is not None
         ]
 
         return results
@@ -1390,7 +1408,7 @@ class DatabaseORMSessionAsync(
 
         # Get.
         select = Select(model)
-        models = await self.sess.exec(select)
+        models = await self.session.exec(select)
         models = list(models)
 
         return models
@@ -1407,7 +1425,7 @@ class DatabaseORMSessionAsync(
         """
 
         # Add.
-        self.sess.add_all(models)
+        self.session.add_all(models)
 
 
     @wrap_transact
@@ -1422,7 +1440,7 @@ class DatabaseORMSessionAsync(
 
         # Delete.
         for model in models:
-            await self.sess.delete(model)
+            await self.session.delete(model)
 
 
     @wrap_transact
@@ -1437,7 +1455,7 @@ class DatabaseORMSessionAsync(
 
         # Refresh.
         for model in models:
-            await self.sess.refresh(model)
+            await self.session.refresh(model)
 
 
     @wrap_transact
@@ -1452,7 +1470,7 @@ class DatabaseORMSessionAsync(
 
         # Refresh.
         for model in models:
-            self.sess.expire(model)
+            self.session.expire(model)
 
 
     @overload
@@ -1519,7 +1537,7 @@ class DatabaseORMStatement(DatabaseORMStatementSuper[DatabaseORMSession]):
         self.sess.get_begin()
 
         # Execute.
-        result: Result = self.sess.sess.exec(self)
+        result: Result = self.sess.session.exec(self)
 
         ## Select.)
         if isinstance(self, Select):
@@ -1530,7 +1548,7 @@ class DatabaseORMStatement(DatabaseORMStatementSuper[DatabaseORMSession]):
 
             ## Select.
             if isinstance(self, Select):
-                self.sess.sess.expunge_all()
+                self.sess.session.expunge_all()
 
             self.sess.commit()
             self.sess.close()
@@ -1564,7 +1582,7 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
         await self.sess.get_begin()
 
         # Execute.
-        result: Result = await self.sess.sess.exec(self)
+        result: Result = await self.sess.session.exec(self)
 
         ## Select.
         if isinstance(self, Select):
@@ -1575,11 +1593,11 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
 
             ## Select.
             if isinstance(self, Select):
-                self.sess.sess.expunge_all()
+                self.sess.session.expunge_all()
 
             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.18.dist-info → reydb-1.2.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.2.18
+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.18.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=QZF26KDL6oRb6RyMEtIJcbiX9TJzK2aUPqjqGjflF7s,80834
-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=-pb5SJBk2WOluWC0ci0OOCOKOj2MIxoy3oVRJ7whpFQ,49337
-reydb-1.2.18.dist-info/METADATA,sha256=SCX11Jre4BRem7gUw8lqaZ495-pNgrqhz45C3-3V4Ws,1647
-reydb-1.2.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.18.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.18.dist-info/RECORD,,