reydb 1.3.2__py3-none-any.whl → 1.3.4__py3-none-any.whl

reydb/rorm.py

@@ -13,7 +13,12 @@ from typing import Self, Any, Type, Literal, TypeVar, Generic, Final, NoReturn,
 from collections.abc import Callable
 from functools import wraps as functools_wraps
 from inspect import iscoroutinefunction as inspect_iscoroutinefunction
-from pydantic import ConfigDict, field_validator as pydantic_field_validator, model_validator as pydantic_model_validator
+from pydantic import (
+    ConfigDict as ModelConfig,
+    EmailStr as Email,
+    field_validator as pydantic_field_validator,
+    model_validator as pydantic_model_validator
+)
 from sqlalchemy import Column, types, text as sqlalchemy_text
 from sqlalchemy.orm import SessionTransaction, load_only
 from sqlalchemy.orm.strategy_options import _AttrType
@@ -28,7 +33,12 @@ from sqlmodel import SQLModel, Session, Table
 from sqlmodel.main import SQLModelMetaclass, FieldInfo, default_registry
 from sqlmodel.ext.asyncio.session import AsyncSession
 from sqlmodel.sql._expression_select_cls import SelectOfScalar as Select
-from datetime import datetime, date, time, timedelta
+from datetime import (
+    datetime as Datetime,
+    date as Date,
+    time as Time,
+    timedelta as Timedelta
+)
 from warnings import filterwarnings
 from reykit.rbase import CallableT, Null, throw, is_instance
 
@@ -242,7 +252,7 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
             - `Callable[[], Any]`: Call function and use return value.
         name : Call argument name and database field name.
             - `None`: Same as attribute name.
-        key : Whether the field is primary key.
+        key : Whether the field is primary key. When set multiple field, then is composite Primary Key.
         key_auto : Whether the field is primary key and automatic increment.
         not_null : Whether the field is not null constraint.
             - `Litreal[False]`: When argument `arg_default` is `Null`, then set argument `arg_default` is `None`.
@@ -322,15 +332,10 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
         ## Field default.
         if 'field_default' in kwargs:
             field_default: str = kwargs.pop('field_default')
-            if field_default == ':time':
-                field_default = sqlalchemy_text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')
             if field_default == ':create_time':
                 field_default = sqlalchemy_text('CURRENT_TIMESTAMP')
             elif field_default == ':update_time':
-                if kwargs['nullable']:
-                    field_default = sqlalchemy_text('NULL ON UPDATE CURRENT_TIMESTAMP')
-                else:
-                    field_default = sqlalchemy_text('NOT NULL ON UPDATE CURRENT_TIMESTAMP')
+                field_default = sqlalchemy_text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')
             kwargs['sa_column_kwargs']['server_default'] = field_default
 
         ## Argument default.
@@ -1959,7 +1964,7 @@ Model = DatabaseORMModel
 Field = DatabaseORMModelField
 
 ## Database ORM model config type.
-Config = ConfigDict
+ModelConfig
 
 ## Database ORM model filed types.
 types = types
@@ -1976,8 +1981,9 @@ wrap_validate_model = pydantic_model_validator
 ## Create decorator of validate database ORM model field.
 wrap_validate_filed = pydantic_field_validator
 
-## Time type.
-Datetime = datetime
-Date = date
-Time = time
-Timedelta = timedelta
+## Other type.
+Datetime
+Date
+Time
+Timedelta
+Email

{reydb-1.3.2.dist-info → reydb-1.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.3.2
+Version: 1.3.4
 Summary: Database method set.
 Project-URL: homepage, https://github.com/reyxbo/reydb/
 Author-email: Rey <reyxbo@163.com>
@@ -15,7 +15,7 @@ License-File: LICENSE
 Keywords: async,asynchronous,database,db,orm,rey,reyxbo
 Requires-Python: >=3.12
 Requires-Dist: aiomysql
-Requires-Dist: pydantic
+Requires-Dist: pydantic[email]
 Requires-Dist: pymysql
 Requires-Dist: reykit
 Requires-Dist: sqlalchemy

{reydb-1.3.2.dist-info → reydb-1.3.4.dist-info}/RECORD

@@ -9,8 +9,8 @@ reydb/rengine.py,sha256=qkpEsfHleia-bT7DBgERpSlZfszB5mLbRACtG-H2D-s,15640
 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=z4rnW5J5zXktEo98kfQFWpJ3PwSnY4lg0vaqzvpe32w,50145
-reydb-1.3.2.dist-info/METADATA,sha256=s2ejd4tVfxhk1ewsDYrSBcHWS3SeKqUEtxOPbKGkgqE,1646
-reydb-1.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.3.2.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.3.2.dist-info/RECORD,,
+reydb/rorm.py,sha256=UHZVNHkQ31RyJ5Ia9wmJ8ammIz59KKYOKh9HX6VEHX4,50002
+reydb-1.3.4.dist-info/METADATA,sha256=1rkEgFjTVVHW1Kzin_-dK4-tY7q7WtRZQTvLvGN2o-I,1653
+reydb-1.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.3.4.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.3.4.dist-info/RECORD,,