lush-sqlalchemyx 0.4.2__tar.gz → 0.6.0__tar.gz

{lush_sqlalchemyx-0.4.2 → lush_sqlalchemyx-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lush-sqlalchemyx
-Version: 0.4.2
+Version: 0.6.0
 Summary: SQLAlchemy helpers (DAL) and async MySQL managers, with some web frameworks integrations
 Author: straydragon
 Author-email: straydragon <straydragonl@foxmail.com>

{lush_sqlalchemyx-0.4.2 → lush_sqlalchemyx-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lush-sqlalchemyx"
-version = "0.4.2"
+version = "0.6.0"
 description = "SQLAlchemy helpers (DAL) and async MySQL managers, with some web frameworks integrations"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -40,6 +40,7 @@ dev = [
     "jinja2sql>=0.8.0",
     "pytest>=8.4.1",
     "pytest-asyncio>=1.1.0",
+    "pytest-bdd>=8.1.0",
     "pytest-cov>=6.2.1",
     "aiosqlite>=0.20.0",
     "aiomysql>=0.2.0",
@@ -57,11 +58,15 @@ testpaths = ["tests"]
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "function"
 asyncio_default_test_loop_scope = "function"
+bdd_features_base_dir = "tests/features"
 
 [tool.coverage.run]
 branch = true
 
 [tool.coverage.report]
+precision = 2
+show_missing = true
+skip_covered = true
 exclude_also = [
     "if TYPE_CHECKING:",
     "if __name__ == .__main__.:",
@@ -169,6 +174,7 @@ ignore = [
     "S101", # assert语句(测试中使用)
     "S105", # 硬编码密码字符串
     "S201", # Flask debug=True
+    "S608", # SQL注入(测试辅助函数的硬编码表名)
     "S301", # 可疑的pickle使用
     "S311", # 非加密安全的随机数
 

{lush_sqlalchemyx-0.4.2 → lush_sqlalchemyx-0.6.0}/src/lush_sqlalchemyx/__init__.py

@@ -10,6 +10,13 @@
 """
 
 from lush_sqlalchemyx.base.dal import (
+    DynamicAsyncDAL,
+    DynamicSyncDAL,
+    DynamicTableConfig,
+    PrimaryKeyT,
+    TableRef,
+    derive_columns_from_dto,
+    derive_pk_from_dto,
     is_soft_delete_hooks_registered,
     register_soft_delete_hooks,
     setup_dal_hooks,
@@ -17,6 +24,13 @@ from lush_sqlalchemyx.base.dal import (
 )
 
 __all__ = (
+    "DynamicAsyncDAL",
+    "DynamicSyncDAL",
+    "DynamicTableConfig",
+    "PrimaryKeyT",
+    "TableRef",
+    "derive_columns_from_dto",
+    "derive_pk_from_dto",
     "is_soft_delete_hooks_registered",
     "register_soft_delete_hooks",
     "setup_dal_hooks",

{lush_sqlalchemyx-0.4.2 → lush_sqlalchemyx-0.6.0}/src/lush_sqlalchemyx/base/dal/__init__.py

@@ -28,8 +28,7 @@ from ._async import (
     BasicAsyncBaseTable,
     ReadOnlyAsyncBaseDAL,
     ReadOnlyBasicAsyncBaseTable,
-    StdAsyncBaseTable,
-    StdReadOnlyBasicAsyncBaseTable,
+
     async_temp_set_lock_wait_timeout,
     async_with_retry,
 )
@@ -49,8 +48,7 @@ from ._common import (
     RetryConfig,
     SoftDeleteTableMixin,
     SQLATableT,
-    StdBaseCU,
-    StdBaseDTO,
+
     escape_like,
     filtered_in_sql_values,
     is_soft_delete_hooks_registered,
@@ -62,6 +60,17 @@ from ._common import (
 # Event listener references — accessed by tests via getattr(module, name).
 from ._common import __prevent_readonly_write as __prevent_readonly_write  # pyright: ignore[reportPrivateUsage]
 from ._common import __receive_before_flush as __receive_before_flush  # pyright: ignore[reportPrivateUsage]
+
+# --- dynamic (no ORM table class) ---
+from ._dynamic import (
+    DynamicAsyncDAL,
+    DynamicSyncDAL,
+    DynamicTableConfig,
+    PrimaryKeyT,
+    TableRef,
+    derive_columns_from_dto,
+    derive_pk_from_dto,
+)
 from ._pagination import (
     build_cursor_stmt,
     build_offset_stmt,
@@ -77,8 +86,7 @@ from ._sync import (
     BasicSyncBaseTable,
     ReadOnlySyncBaseDAL,
     ReadOnlySyncBaseTable,
-    StdReadOnlySyncBaseTable,
-    StdSyncBaseTable,
+
     SyncBaseDAL,
     SyncRawDAL,
     SyncRawReadDAL,
@@ -108,14 +116,20 @@ __all__ = (
     "SQLATableT",
     "SoftDeleteTableMixin",
     "FieldIsDeleteSoftDeleteTableMixin",
-    "StdBaseCU",
-    "StdBaseDTO",
     "escape_like",
     "filtered_in_sql_values",
     "is_soft_delete_hooks_registered",
     "register_soft_delete_hooks",
     "setup_dal_hooks",
     "unregister_soft_delete_hooks",
+    # dynamic
+    "DynamicAsyncDAL",
+    "DynamicSyncDAL",
+    "DynamicTableConfig",
+    "PrimaryKeyT",
+    "TableRef",
+    "derive_columns_from_dto",
+    "derive_pk_from_dto",
     # async
     "AsyncBaseDAL",
     "AsyncRawDAL",
@@ -128,16 +142,14 @@ __all__ = (
     "BasicAsyncBaseTable",
     "ReadOnlyAsyncBaseDAL",
     "ReadOnlyBasicAsyncBaseTable",
-    "StdAsyncBaseTable",
-    "StdReadOnlyBasicAsyncBaseTable",
+
     "async_temp_set_lock_wait_timeout",
     "async_with_retry",
     # sync
     "BasicSyncBaseTable",
     "ReadOnlySyncBaseDAL",
     "ReadOnlySyncBaseTable",
-    "StdReadOnlySyncBaseTable",
-    "StdSyncBaseTable",
+
     "SyncBaseDAL",
     "SyncRawDAL",
     "SyncRawReadDAL",

{lush_sqlalchemyx-0.4.2 → lush_sqlalchemyx-0.6.0}/src/lush_sqlalchemyx/base/dal/_async.py

@@ -7,9 +7,7 @@
 from __future__ import annotations
 
 import asyncio
-import datetime
 import logging
-import warnings
 from collections.abc import AsyncGenerator, Awaitable, Callable, Iterable
 from contextlib import asynccontextmanager, suppress
 from typing import TYPE_CHECKING, Any, ClassVar, Generic, Literal, ParamSpec, TypeVar, cast
@@ -19,7 +17,7 @@ from lush_dal_protocol.abc import AbstractAsyncReadDAL, AbstractAsyncWriteDAL
 from pydantic import BaseModel
 from sqlalchemy import ColumnExpressionArgument
 from sqlalchemy.ext.asyncio import AsyncAttrs, AsyncSession
-from sqlalchemy.orm import DeclarativeBase, InstrumentedAttribute, Mapped, mapped_column
+from sqlalchemy.orm import DeclarativeBase, InstrumentedAttribute
 
 from lush_sqlalchemyx._compat import require_async
 
@@ -31,7 +29,6 @@ from ._common import (
     CUModelT,
     DBRetryableError,
     DTOModelT,
-    FieldIsDeleteSoftDeleteTableMixin,
     ReadOnlyMixin,
     RetryConfig,
     SoftDeleteTableMixin,
@@ -143,106 +140,6 @@ class ReadOnlyBasicAsyncBaseTable(AsyncSqlATableBase, ReadOnlyMixin):
     __abstract__ = True
 
 
-class StdAsyncBaseTable(BasicAsyncBaseTable, FieldIsDeleteSoftDeleteTableMixin):
-    """标准异步表类: 包含 id/时间戳/操作人/软删除等标准字段.
-
-    .. deprecated::
-        此类预设了特定业务字段, 下游应自行继承 ``BasicAsyncBaseTable`` 定义所需字段.
-    """
-
-    __abstract__ = True
-
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        super().__init_subclass__(**kwargs)
-        if not cls.__dict__.get("__abstract__", False):
-            warnings.warn(
-                f"{cls.__name__} 继承了已废弃的 StdAsyncBaseTable, 请改为直接继承 BasicAsyncBaseTable 并自行定义所需字段",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-    id: Mapped[int] = mapped_column(sa.Integer, primary_key=True, autoincrement=True)
-
-    create_datetime: Mapped[datetime.datetime] = mapped_column(
-        sa.DateTime,
-        nullable=False,
-        comment="创建时间",
-        server_default=sa.sql.func.now(),
-        server_onupdate=sa.FetchedValue(),
-    )
-
-    create_operator_id: Mapped[int] = mapped_column(
-        sa.Integer,
-        nullable=False,
-        comment="创建人",
-        default=0,
-    )
-
-    update_datetime: Mapped[datetime.datetime] = mapped_column(
-        sa.DateTime,
-        nullable=True,
-        comment="修改时间",
-        server_default=sa.sql.func.now(),
-        onupdate=sa.sql.func.now(),
-        server_onupdate=sa.FetchedValue(),
-    )
-    update_operator_id: Mapped[int | None] = mapped_column(
-        sa.Integer,
-        nullable=True,
-        comment="修改人",
-    )
-
-
-class StdReadOnlyBasicAsyncBaseTable(ReadOnlyBasicAsyncBaseTable):
-    """标准只读异步表基类: 包含 id/时间戳/操作人等标准字段.
-
-    .. deprecated::
-        此类预设了特定业务字段, 下游应自行继承 ``ReadOnlyBasicAsyncBaseTable`` 定义所需字段.
-    """
-
-    __abstract__ = True
-
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        super().__init_subclass__(**kwargs)
-        if not cls.__dict__.get("__abstract__", False):
-            warnings.warn(
-                f"{cls.__name__} 继承了已废弃的 StdReadOnlyBasicAsyncBaseTable, 请改为直接继承 ReadOnlyBasicAsyncBaseTable 并自行定义所需字段",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-    id: Mapped[int] = mapped_column(sa.Integer, primary_key=True, autoincrement=True)
-
-    create_datetime: Mapped[datetime.datetime] = mapped_column(
-        sa.DateTime,
-        nullable=False,
-        comment="创建时间",
-        server_default=sa.sql.func.now(),
-        server_onupdate=sa.FetchedValue(),
-    )
-
-    create_operator_id: Mapped[int] = mapped_column(
-        sa.Integer,
-        nullable=False,
-        comment="创建人",
-        default=0,
-    )
-
-    update_datetime: Mapped[datetime.datetime] = mapped_column(
-        sa.DateTime,
-        nullable=True,
-        comment="修改时间",
-        server_default=sa.sql.func.now(),
-        onupdate=sa.sql.func.now(),
-        server_onupdate=sa.FetchedValue(),
-    )
-    update_operator_id: Mapped[int | None] = mapped_column(
-        sa.Integer,
-        nullable=True,
-        comment="修改人",
-    )
-
-
 # ---------------------------------------------------------------------------
 # Async DAL hierarchy
 # ---------------------------------------------------------------------------
@@ -905,8 +802,7 @@ __all__ = (
     "BasicAsyncBaseTable",
     "ReadOnlyAsyncBaseDAL",
     "ReadOnlyBasicAsyncBaseTable",
-    "StdAsyncBaseTable",
-    "StdReadOnlyBasicAsyncBaseTable",
+
     "async_temp_set_lock_wait_timeout",
     "async_with_retry",
 )

{lush_sqlalchemyx-0.4.2 → lush_sqlalchemyx-0.6.0}/src/lush_sqlalchemyx/base/dal/_common.py

@@ -5,10 +5,8 @@
 
 from __future__ import annotations
 
-import datetime
 import logging
 import random
-import warnings
 from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from typing import Any, ClassVar, Final, Generic, TypeVar, cast
@@ -18,7 +16,7 @@ from lush_dal_protocol.dto import BaseCU as _ProtocolBaseCU
 from lush_dal_protocol.dto import BaseDTO as _ProtocolBaseDTO
 from lush_dal_protocol.dto import CUModelT as CUModelT  # noqa: PLC0414
 from lush_dal_protocol.dto import DTOModelT as DTOModelT  # noqa: PLC0414
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict
 from sqlalchemy import event as sa_event
 from sqlalchemy.exc import OperationalError as SQLAlchemyOperationalError
 from sqlalchemy.orm import Mapped, ORMExecuteState, mapped_column, with_loader_criteria
@@ -163,47 +161,7 @@ class BaseDTO(_ProtocolBaseDTO[CUModelT]):
     model_config = ConfigDict(from_attributes=True)
 
 
-class StdBaseCU(BaseCU[SQLATableT]):
-    """标准 CU 基类: 包含创建人/修改人等标准字段.
 
-    .. deprecated::
-        此类预设了特定业务字段, 下游应自行继承 ``BaseCU`` 定义所需字段.
-    """
-
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        super().__init_subclass__(**kwargs)
-        warnings.warn(
-            f"{cls.__name__} 继承了已废弃的 StdBaseCU, 请改为直接继承 BaseCU 并自行定义所需字段",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-    create_operator_id: int = 0
-    update_operator_id: int | None = None
-
-
-class StdBaseDTO(BaseDTO[CUModelT]):
-    """标准 DTO 基类: 包含 id/时间戳/操作人等标准字段.
-
-    .. deprecated::
-        此类预设了特定业务字段, 下游应自行继承 ``BaseDTO`` 定义所需字段.
-    """
-
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        super().__init_subclass__(**kwargs)
-        warnings.warn(
-            f"{cls.__name__} 继承了已废弃的 StdBaseDTO, 请改为直接继承 BaseDTO 并自行定义所需字段",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-    id: int = Field(..., description="ID")
-    create_datetime: datetime.datetime = Field(..., description="创建时间")
-    create_operator_id: int = Field(..., description="创建人")
-    update_datetime: datetime.datetime | None = Field(None, description="修改时间")
-    update_operator_id: int | None = Field(None, description="修改人")
-
-    model_config = ConfigDict(from_attributes=True)
 
 
 # ---------------------------------------------------------------------------
@@ -256,7 +214,9 @@ class FieldIsDeleteSoftDeleteTableMixin(SoftDeleteTableMixin):
     等价旧版 ``SoftDeleteTableMixin``，仅需 rename.
     """
 
-    is_delete: Mapped[int] = mapped_column(sa.Integer, default=0, comment="逻辑删除")
+    is_delete: Mapped[int] = mapped_column(
+        sa.SmallInteger, default=0, comment="逻辑删除"
+    )  # NOTE(@l8ng): 可以优化, 比如给个配置配置mysql可以用tinyint, 现在用 smallint 是因为基本主流数据库都支持
 
 
 class ReadOnlyMixin:
@@ -452,8 +412,7 @@ __all__ = (
     "SQLATableT",
     "SQLAlchemyOperationalError",
     "SoftDeleteTableMixin",
-    "StdBaseCU",
-    "StdBaseDTO",
+
     "T",
     "V",
     "_ensure_strict_fields",