reydb 1.2.8__py3-none-any.whl → 1.2.10__py3-none-any.whl

reydb/rconfig.py

@@ -43,6 +43,7 @@ class DatabaseTableConfig(rorm.Model, table=True):
     Database `config` table model.
     """
 
+    __name__ = 'config'
     __comment__ = 'Config data table.'
     create_time: rorm.Datetime = rorm.Field(field_default=':create_time', not_null=True, index_n=True, comment='Config create time.')
     update_time: rorm.Datetime = rorm.Field(field_default=':update_time', index_n=True, comment='Config update time.')

reydb/rerror.py

@@ -37,6 +37,7 @@ class DatabaseTableError(rorm.Model, table=True):
     Database `error` table model.
     """
 
+    __name__ = 'error'
     __comment__ = 'Error log table.'
     create_time: rorm.Datetime = rorm.Field(field_default=':create_time', not_null=True, index_n=True, comment='Record create time.')
     id: int = rorm.Field(rorm.types_mysql.INTEGER(unsigned=True), key_auto=True, comment='ID.')

reydb/rorm.py

@@ -27,7 +27,7 @@ from sqlmodel.ext.asyncio.session import AsyncSession
 from sqlmodel.main import SQLModelMetaclass, FieldInfo, default_registry
 from sqlmodel.sql._expression_select_cls import SelectOfScalar as Select
 from datetime import datetime, date, time, timedelta
-from reykit.rbase import CallableT, throw, is_instance
+from reykit.rbase import CallableT, Null, throw, is_instance
 
 from . import rdb
 from .rbase import (
@@ -190,7 +190,7 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
         field_type: TypeEngine | None = None,
         *,
         field_default: str | Literal[':time'] | Literal[':create_time'] | Literal[':update_time'] = None,
-        arg_default: Any | Callable[[], Any] | None = None,
+        arg_default: Any | Callable[[], Any] | Null.Type = Null,
         arg_update: Any | Callable[[], Any] = None,
         name: str | None = None,
         key: bool = False,
@@ -329,14 +329,14 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
             kwargs['sa_column_kwargs']['server_default'] = field_default
 
         ## Argument default.
-        arg_default = kwargs.pop('arg_default', None)
-        if arg_default is not None:
-            if callable(arg_default):
-                kwargs['default_factory'] = arg_default
-            else:
-                kwargs['default'] = arg_default
-        elif kwargs['nullable']:
-            kwargs['default'] = None
+        arg_default = kwargs.pop('arg_default', Null)
+        if arg_default == Null:
+            if kwargs['nullable']:
+                kwargs['default'] = None
+        elif callable(arg_default):
+            kwargs['default_factory'] = arg_default
+        else:
+            kwargs['default'] = arg_default
 
         ## Argument update.
         if 'arg_update' in kwargs:
@@ -641,9 +641,9 @@ class DatabaseORMSessionSuper(
         # Build.
         match self:
             case DatabaseORMSession():
-                select = DatabaseORMStatementSelect[DatabaseORMModelT](self, model)
+                select = DatabaseORMStatementSelect(self, model)
             case DatabaseORMSessionAsync():
-                select = DatabaseORMStatementSelectAsync[DatabaseORMModelT](self, model)
+                select = DatabaseORMStatementSelectAsync(self, model)
 
         return select
 
@@ -668,9 +668,9 @@ class DatabaseORMSessionSuper(
         # Build.
         match self:
             case DatabaseORMSession():
-                insert = DatabaseORMStatementInsert[DatabaseORMModelT](self, model)
+                insert = DatabaseORMStatementInsert(self, model)
             case DatabaseORMSessionAsync():
-                insert = DatabaseORMStatementInsertAsync[DatabaseORMModelT](self, model)
+                insert = DatabaseORMStatementInsertAsync(self, model)
 
         return insert
 
@@ -695,9 +695,9 @@ class DatabaseORMSessionSuper(
         # Build.
         match self:
             case DatabaseORMSession():
-                update = DatabaseORMStatementUpdate[DatabaseORMModelT](self, model)
+                update = DatabaseORMStatementUpdate(self, model)
             case DatabaseORMSessionAsync():
-                update = DatabaseORMStatementUpdateAsync[DatabaseORMModelT](self, model)
+                update = DatabaseORMStatementUpdateAsync(self, model)
 
         return update
 
@@ -722,9 +722,9 @@ class DatabaseORMSessionSuper(
         # Build.
         match self:
             case DatabaseORMSession():
-                delete = DatabaseORMStatementDelete[DatabaseORMModelT](self, model)
+                delete = DatabaseORMStatementDelete(self, model)
             case DatabaseORMSessionAsync():
-                delete = DatabaseORMStatementDeleteAsync[DatabaseORMModelT](self, model)
+                delete = DatabaseORMStatementDeleteAsync(self, model)
 
         return delete
 
@@ -1095,6 +1095,12 @@ class DatabaseORMSession(
             self.sess.expire(model)
 
 
+    @overload
+    def select(self, model: Type[DatabaseORMModelT] | DatabaseORMModelT) -> 'DatabaseORMStatementSelect[list[DatabaseORMModelT]]': ...
+
+    select = DatabaseORMSessionSuper.select
+
+
 class DatabaseORMSessionAsync(
     DatabaseORMSessionSuper[
         DatabaseORMAsync,
@@ -1463,6 +1469,12 @@ class DatabaseORMSessionAsync(
             self.sess.expire(model)
 
 
+    @overload
+    def select(self, model: Type[DatabaseORMModelT] | DatabaseORMModelT) -> 'DatabaseORMStatementSelectAsync[list[DatabaseORMModelT]]': ...
+
+    select = DatabaseORMSessionSuper.select
+
+
 class DatabaseORMStatementSuper(DatabaseORMBase, Generic[DatabaseORMSessionT]):
     """
     Database ORM statement super type.
@@ -1516,6 +1528,12 @@ class DatabaseORMStatement(DatabaseORMStatementSuper[DatabaseORMSession], Generi
 
         # Automatic commit.
         if self.sess.autocommit:
+
+            ## Select.
+            if isinstance(self, Select):
+                for model in result:
+                    self.sess.sess.expunge(model)
+
             self.sess.commit()
             self.sess.close()
 
@@ -1547,6 +1565,12 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
 
         # Automatic commit.
         if self.sess.autocommit:
+
+            ## Select.
+            if isinstance(self, Select):
+                for model in result:
+                    self.sess.sess.expunge(model)
+
             await self.sess.commit()
             await self.sess.close()
             await self.sess.orm.db.dispose()
@@ -1554,7 +1578,7 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
         return result
 
 
-class DatabaseORMStatementSelect(DatabaseORMStatement[list[DatabaseORMModelT]], Select, Generic[DatabaseORMModelT]):
+class DatabaseORMStatementSelect(DatabaseORMStatement, Select, Generic[DatabaseORMStatementReturn]):
     """
     Database ORM `select` statement type.
 
@@ -1566,7 +1590,13 @@ class DatabaseORMStatementSelect(DatabaseORMStatement[list[DatabaseORMModelT]],
     inherit_cache: Final = True
 
 
-class DatabaseORMStatementInsert(DatabaseORMStatement[None], Insert, Generic[DatabaseORMModelT]):
+    @overload
+    def execute(self) -> DatabaseORMStatementReturn: ...
+
+    execute = DatabaseORMStatement.execute
+
+
+class DatabaseORMStatementInsert(DatabaseORMStatement[None], Insert):
     """
     Database ORM `insert` statement type.
 
@@ -1578,7 +1608,7 @@ class DatabaseORMStatementInsert(DatabaseORMStatement[None], Insert, Generic[Dat
     inherit_cache: Final = True
 
 
-class DatabaseORMStatementUpdate(DatabaseORMStatement[None], Update, Generic[DatabaseORMModelT]):
+class DatabaseORMStatementUpdate(DatabaseORMStatement[None], Update):
     """
     Database ORM `update` statement type.
 
@@ -1590,7 +1620,7 @@ class DatabaseORMStatementUpdate(DatabaseORMStatement[None], Update, Generic[Dat
     inherit_cache: Final = True
 
 
-class DatabaseORMStatementDelete(DatabaseORMStatement[None], Delete, Generic[DatabaseORMModelT]):
+class DatabaseORMStatementDelete(DatabaseORMStatement[None], Delete):
     """
     Database ORM `delete` statement type.
 
@@ -1602,7 +1632,7 @@ class DatabaseORMStatementDelete(DatabaseORMStatement[None], Delete, Generic[Dat
     inherit_cache: Final = True
 
 
-class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync[list[DatabaseORMModelT]], Select, Generic[DatabaseORMModelT]):
+class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync, Select):
     """
     Asynchronous database ORM `select` statement type.
 
@@ -1614,7 +1644,13 @@ class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync[list[DatabaseORM
     inherit_cache: Final = True
 
 
-class DatabaseORMStatementInsertAsync(DatabaseORMStatementAsync[None], Insert, Generic[DatabaseORMModelT]):
+    @overload
+    async def execute(self) -> DatabaseORMStatementReturn: ...
+
+    execute = DatabaseORMStatementAsync.execute
+
+
+class DatabaseORMStatementInsertAsync(DatabaseORMStatementAsync[None], Insert):
     """
     Asynchronous database ORM `insert` statement type.
 
@@ -1626,7 +1662,7 @@ class DatabaseORMStatementInsertAsync(DatabaseORMStatementAsync[None], Insert, G
     inherit_cache: Final = True
 
 
-class DatabaseORMStatementUpdateAsync(DatabaseORMStatementAsync[None], Update, Generic[DatabaseORMModelT]):
+class DatabaseORMStatementUpdateAsync(DatabaseORMStatementAsync[None], Update):
     """
     Asynchronous database ORM `update` statement type.
 
@@ -1638,7 +1674,7 @@ class DatabaseORMStatementUpdateAsync(DatabaseORMStatementAsync[None], Update, G
     inherit_cache: Final = True
 
 
-class DatabaseORMStatementDeleteAsync(DatabaseORMStatementAsync[None], Delete, Generic[DatabaseORMModelT]):
+class DatabaseORMStatementDeleteAsync(DatabaseORMStatementAsync[None], Delete):
     """
     Asynchronous database ORM `delete` statement type.
 

{reydb-1.2.8.dist-info → reydb-1.2.10.dist-info}/METADATA

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

{reydb-1.2.8.dist-info → reydb-1.2.10.dist-info}/RECORD

@@ -2,14 +2,14 @@ reydb/__init__.py,sha256=4mnlkfJfkBfxBpCotVUJ86f4AnT8plqlFbGiH3vZ4PM,550
 reydb/rall.py,sha256=IxSPGh77xz7ndDC7J8kZ_66Gq_xTAztGtnELUku1Ouw,364
 reydb/rbase.py,sha256=vx37yV6LlWP89nWAfYyOf0Xm3N_e9eB8z5Mxe-aTEo4,8248
 reydb/rbuild.py,sha256=0jI0MNl-BIhQtuT_-GeXBPTjG76k9EE3wwEQXGhTJyc,80938
-reydb/rconfig.py,sha256=B_lwfmMg4V4C_SmuLZi8dqGhb3El3ahxouj1snhS_Ek,19143
+reydb/rconfig.py,sha256=xoujEyZzkB9UwG8lkZBDBmeUOEo8Sr1Oktveos-EWWc,19168
 reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
 reydb/rdb.py,sha256=syyqZbEu92NbCj9O6_T6iAv7E46CyfQOC4T8qtPfHNs,14364
-reydb/rerror.py,sha256=Hqb2CA6sG7yEPDt3UHzqrgdt63BqoWbCzji3mKBIlp0,14864
+reydb/rerror.py,sha256=uwVuolRp-PmXXUZIA_Qd2S6NSOm1S0vDJvehX6l__U8,14888
 reydb/rexec.py,sha256=djHx311c6mr1IjzNLqnGe-4yr3qNmYGUy4pHQA3WElQ,53042
 reydb/rinfo.py,sha256=LjrqTA7JJbWJsjXwV-zKpbE1htv-whg6239hoQj4yIU,18151
-reydb/rorm.py,sha256=BXRmAaZRrIS6ZprtKRDMUHXtxuaMa6RNC7-_uqARSpo,43650
-reydb-1.2.8.dist-info/METADATA,sha256=LW49lxiggNPo5NgnLVeKo1Euvi11f3QlrD40falMIOE,1621
-reydb-1.2.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.8.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.8.dist-info/RECORD,,
+reydb/rorm.py,sha256=kVe2PtF7pYy6zws8c9qBDYkY2ZmGoiHcio1wN_3LmEk,44244
+reydb-1.2.10.dist-info/METADATA,sha256=Egt0VRbjmWTbVl-MwSs7qNrLDKGGvRMYYNJ3xtrUmQ4,1622
+reydb-1.2.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.10.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.10.dist-info/RECORD,,