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

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:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.2.8
+Version: 1.2.9
 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.9.dist-info}/RECORD

@@ -8,8 +8,8 @@ reydb/rdb.py,sha256=syyqZbEu92NbCj9O6_T6iAv7E46CyfQOC4T8qtPfHNs,14364
 reydb/rerror.py,sha256=Hqb2CA6sG7yEPDt3UHzqrgdt63BqoWbCzji3mKBIlp0,14864
 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=ui3kU5b4zViDvEkVKPD2eZpX8IuSaKhMxJre-MpDbpQ,43649
+reydb-1.2.9.dist-info/METADATA,sha256=0nqi8kk_crUCkQp9EpXMAvwUBDBG6UyPF68bWEtXUag,1621
+reydb-1.2.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.9.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.9.dist-info/RECORD,,