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

reydb/rorm.py

@@ -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
@@ -560,32 +562,12 @@ class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseT, DatabaseORMSessionT])
 class DatabaseORM(DatabaseORMSuper['rdb.Database', 'DatabaseORMSession']):
     """
     Database ORM type.
-
-    Attributes
-    ----------
-    metaData : Registry metadata instance.
-    DatabaseModel : Database ORM model type.
-    Field : Database ORM model field type.
-    Config : Database ORM model config type.
-    types : Database ORM model filed types module.
-    wrap_validate_model : Create decorator of validate database ORM model.
-    wrap_validate_filed : Create decorator of validate database ORM model field.
     """
 
 
 class DatabaseORMAsync(DatabaseORMSuper['rdb.DatabaseAsync', 'DatabaseORMSessionAsync']):
     """
     Asynchronous database ORM type.
-
-    Attributes
-    ----------
-    metaData : Registry metadata instance.
-    DatabaseModel : Database ORM model type.
-    Field : Database ORM model field type.
-    Config : Database ORM model config type.
-    types : Database ORM model filed types module.
-    wrap_validate_model : Create decorator of validate database ORM model.
-    wrap_validate_filed : Create decorator of validate database ORM model field.
     """
 
 
@@ -623,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
 
 
@@ -794,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.db.engine)
 
-        return self.sess
+        return self.session
 
 
     def get_begin(self) -> SessionTransaction:
@@ -848,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:
@@ -867,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.db.engine)
 
             # Begin.
             if self.begin is None:
-                self.begin = self.sess.begin()
+                self.begin = self.session.begin()
 
             # Execute.
             result = method(self, *args, **kwargs)
@@ -973,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
 
@@ -1010,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
@@ -1036,7 +1026,7 @@ class DatabaseORMSession(
 
         # Get.
         select = Select(model)
-        models = self.sess.exec(select)
+        models = self.session.exec(select)
         models = list(models)
 
         return models
@@ -1053,7 +1043,7 @@ class DatabaseORMSession(
         """
 
         # Add.
-        self.sess.add_all(models)
+        self.session.add_all(models)
 
 
     @wrap_transact
@@ -1068,7 +1058,7 @@ class DatabaseORMSession(
 
         # Delete.
         for model in models:
-            self.sess.delete(model)
+            self.session.delete(model)
 
 
     @wrap_transact
@@ -1083,7 +1073,7 @@ class DatabaseORMSession(
 
         # Refresh.
         for model in models:
-            self.sess.refresh(model)
+            self.session.refresh(model)
 
 
     @wrap_transact
@@ -1098,7 +1088,7 @@ class DatabaseORMSession(
 
         # Refresh.
         for model in models:
-            self.sess.expire(model)
+            self.session.expire(model)
 
 
     @overload
@@ -1167,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.db.engine)
 
-        return self.sess
+        return self.session
 
 
     async def get_begin(self) -> AsyncSessionTransaction:
@@ -1221,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:
@@ -1240,7 +1239,6 @@ class DatabaseORMSessionAsync(
         """
 
 
-        # Define.
         @functools_wraps(method)
         async def wrap(self: 'DatabaseORMSessionAsync', *args, **kwargs):
 
@@ -1291,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)
 
 
@@ -1321,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)
 
 
@@ -1347,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
 
@@ -1384,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
@@ -1410,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
@@ -1427,7 +1425,7 @@ class DatabaseORMSessionAsync(
         """
 
         # Add.
-        self.sess.add_all(models)
+        self.session.add_all(models)
 
 
     @wrap_transact
@@ -1442,7 +1440,7 @@ class DatabaseORMSessionAsync(
 
         # Delete.
         for model in models:
-            await self.sess.delete(model)
+            await self.session.delete(model)
 
 
     @wrap_transact
@@ -1457,7 +1455,7 @@ class DatabaseORMSessionAsync(
 
         # Refresh.
         for model in models:
-            await self.sess.refresh(model)
+            await self.session.refresh(model)
 
 
     @wrap_transact
@@ -1472,7 +1470,7 @@ class DatabaseORMSessionAsync(
 
         # Refresh.
         for model in models:
-            self.sess.expire(model)
+            self.session.expire(model)
 
 
     @overload
@@ -1539,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):
@@ -1550,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()
@@ -1584,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):
@@ -1595,7 +1593,7 @@ 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()
@@ -1607,13 +1605,10 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
 class DatabaseORMStatementSelectSuper(DatabaseORMStatementSuper, Select):
     """
     Database ORM `select` statement super type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     def fields(self, *names: str) -> Self:
@@ -1672,13 +1667,10 @@ class DatabaseORMStatementSelectSuper(DatabaseORMStatementSuper, Select):
 class DatabaseORMStatementSelect(DatabaseORMStatement, DatabaseORMStatementSelectSuper, Generic[DatabaseORMModelT]):
     """
     Database ORM `select` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     @overload
@@ -1690,13 +1682,10 @@ class DatabaseORMStatementSelect(DatabaseORMStatement, DatabaseORMStatementSelec
 class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync, DatabaseORMStatementSelectSuper, Generic[DatabaseORMModelT]):
     """
     Asynchronous database ORM `select` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     @overload
@@ -1708,13 +1697,10 @@ class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync, DatabaseORMStat
 class DatabaseORMStatementInsertSuper(DatabaseORMStatementSuper, Insert):
     """
     Database ORM `select` statement super type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     def ignore(self) -> Self:
@@ -1794,37 +1780,28 @@ class DatabaseORMStatementInsertSuper(DatabaseORMStatementSuper, Insert):
 class DatabaseORMStatementInsert(DatabaseORMStatement, DatabaseORMStatementInsertSuper):
     """
     Database ORM `insert` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementInsertAsync(DatabaseORMStatementAsync, DatabaseORMStatementInsertSuper):
     """
     Asynchronous database ORM `insert` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementUpdateSuper(DatabaseORMStatementSuper, Update):
     """
     Database ORM `update` statement super type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     def where(self, *clauses: str | _ColumnExpressionArgument[bool]) -> Self:
@@ -1878,37 +1855,28 @@ class DatabaseORMStatementUpdateSuper(DatabaseORMStatementSuper, Update):
 class DatabaseORMStatementUpdate(DatabaseORMStatement, DatabaseORMStatementUpdateSuper):
     """
     Database ORM `update` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementUpdateAsync(DatabaseORMStatementAsync, DatabaseORMStatementUpdateSuper):
     """
     Asynchronous database ORM `update` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementDeleteSuper(DatabaseORMStatementSuper, Delete):
     """
     Database ORM `delete` statement super type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
     def where(self, *clauses: str | _ColumnExpressionArgument[bool]) -> Self:
@@ -1962,25 +1930,19 @@ class DatabaseORMStatementDeleteSuper(DatabaseORMStatementSuper, Delete):
 class DatabaseORMStatementDelete(DatabaseORMStatement, DatabaseORMStatementDeleteSuper):
     """
     Database ORM `delete` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 class DatabaseORMStatementDeleteAsync(DatabaseORMStatementAsync, DatabaseORMStatementDeleteSuper):
     """
     Asynchronous database ORM `delete` statement type.
-
-    Attributes
-    ----------
-    inherit_cache : Compatible type.
     """
 
     inherit_cache: Final = True
+    'Compatible type.'
 
 
 # Simple path.

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

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

reydb-1.2.19.dist-info/RECORD

@@ -0,0 +1,15 @@
+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,,

reydb-1.2.17.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=ZmVpoP7GuwuP3536Lz34kaZDG5MCVf0JFBaT5nm1-L8,17686
-reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
-reydb/rdb.py,sha256=s96XLLH8ZmJm-q4J9RRP6KGkxH3MGodPOcWqB-6-V4U,14356
-reydb/rerror.py,sha256=0AIe7ZpDEe60xTV_FJCCBwzFVHwONh7qxvYpgwzZDvI,14401
-reydb/rexec.py,sha256=DdmcJ6j4il06wEyvhttac2GpmGdsZJtOEljH7wUvca8,52948
-reydb/rinfo.py,sha256=1lMnD-eN97vHrQ1DM8X7mQIhyLmCg6V0P2QwSeF07_c,18127
-reydb/rorm.py,sha256=77QQgQglvA2b4fRH1xBqca7BQ-Hu2MudDopRPJ6E4J4,50761
-reydb-1.2.17.dist-info/METADATA,sha256=zfoqQQNi3sPymiV82KzaBJS_-c4ZA_3r2VIMq9xK3WU,1647
-reydb-1.2.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.17.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.17.dist-info/RECORD,,