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

reydb/rbuild.py

@@ -11,6 +11,7 @@
 
 from typing import TypedDict, NotRequired, Literal, Type, TypeVar, Generic
 from copy import deepcopy
+from sqlalchemy import UniqueConstraint
 from reykit.rbase import throw, is_instance
 from reykit.rstdout import ask
 
@@ -2487,7 +2488,7 @@ class DatabaseBuildSuper(DatabaseBase, Generic[DatabaseT]):
                     if column.autoincrement
                     else ' | KEY'
                 ) + (
-                    f" | DEFAULT '{column.server_default.arg}'"
+                    f" | DEFAULT {column.server_default.arg}"
                     if column.server_default
                     else ''
                 ) + (
@@ -2500,14 +2501,10 @@ class DatabaseBuildSuper(DatabaseBase, Generic[DatabaseT]):
         )
 
         ## Index.
-        if (table.indexes):
+        if table.indexes:
             text += '\n' + '\n'.join(
                 [
-                    (
-                        '    UNIQUE'
-                        if index.unique
-                        else '    NORMAL'
-                    ) + f' INDEX `{index.name}` : ' + ', '.join(
+                    '    NORMAL INDEX: ' + ', '.join(
                         [
                             f'`{column.name}`'
                             for column in index.expressions
@@ -2517,6 +2514,24 @@ class DatabaseBuildSuper(DatabaseBase, Generic[DatabaseT]):
                 ]
             )
 
+        ## Constraint.
+        if table.constraints:
+            text += '\n' + '\n'.join(
+                [
+                    (
+                        '    UNIQUE CONSTRAIN: '
+                        if type(constraint) == UniqueConstraint
+                        else '    PRIMARY KEY CONSTRAIN: '
+                    ) + ', '.join(
+                        [
+                            f'`{column.name}`'
+                            for column in constraint.columns
+                        ]
+                    )
+                    for constraint in table.constraints
+                ]
+            )
+
         return text
 
 

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 (
@@ -166,8 +166,7 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
         ):
             table: Table = cls.__table__
             for index in table.indexes:
-                index_name_prefix = ['u_', 'n_'][index.unique]
-                index_name = index_name_prefix + '_'.join(
+                index_name = '_'.join(
                     column.key
                     for column in index.expressions
                 )
@@ -191,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,
@@ -330,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.7.dist-info → reydb-1.2.9.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
 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=imakdlqQXzQlbAukti3_REVU_h7IRRE3fwUk91LaIIM,80430
+reydb/rbuild.py,sha256=0jI0MNl-BIhQtuT_-GeXBPTjG76k9EE3wwEQXGhTJyc,80938
 reydb/rconfig.py,sha256=B_lwfmMg4V4C_SmuLZi8dqGhb3El3ahxouj1snhS_Ek,19143
 reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
 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=hwQlD1Dn4cxn1Kp5H-M85XfNMl4blohDOGrnDjLMr6A,43734
-reydb-1.2.7.dist-info/METADATA,sha256=T6s0-oO-8_d59qE4tw-LKEYQsLmWMCaHlMDUEFrYhsg,1621
-reydb-1.2.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.7.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.7.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,,