ezKit 1.12.44__tar.gz → 1.12.46__tar.gz

{ezkit-1.12.44/ezKit.egg-info → ezkit-1.12.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezKit
-Version: 1.12.44
+Version: 1.12.46
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.12.44 → ezkit-1.12.46}/ezKit/database.py

@@ -229,6 +229,10 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                 # 避免字段名冲突
                 param_key = f"{base.replace('.', '_')}_{op}"
 
+                # 特殊处理日期字段
+                if param_key.startswith("datetime::date"):
+                    param_key = param_key.replace("datetime::date", "datetime_date", 1)
+
                 if op == "like":
                     sql_parts.append(f"{base} LIKE :{param_key}")
                     param_dict[param_key] = f"%{value}%"
@@ -246,6 +250,9 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                     param_dict[f"{param_key}_end"] = value[1]
             else:
                 param_key = base_field.replace(".", "_")
+                # 特殊处理日期字段
+                if param_key.startswith("datetime::date"):
+                    param_key = param_key.replace("datetime::date", "datetime_date", 1)
                 sql_parts.append(f"{base_field} = :{param_key}")
                 param_dict[param_key] = value
 
@@ -790,11 +797,14 @@ async def async_create_and_count(db: DatabaseAsyncSession, schema: Type[Declarat
 # --------------------------------------------------------------------------------------------------
 
 
-async def async_read_and_count(db: DatabaseAsyncSession, data: dict, statement_prefix: str, statement_end: str = "") -> dict:
+async def async_read_and_count(db: DatabaseAsyncSession, data: dict, statement_select: str, statement_from: str, statement_end: str = "") -> dict:
 
     # 初始返回结果 (适用于 count 等于 0)
     result = {"count": 0, "list": [], "pageIndex": data["pageIndex"], "pageSize": 0}
 
+    # Statement Prefix
+    statement_prefix = f"{statement_select} {statement_from}"
+
     # ----------------------------------------------------------------------------------------------
 
     # 构建 WHERE
@@ -812,7 +822,7 @@ async def async_read_and_count(db: DatabaseAsyncSession, data: dict, statement_p
 
     # table_name: str
     # count_statement = text(f"SELECT COUNT(*) FROM {table_name} {where_clause}").bindparams(*bind_params)
-    count_statement = text(f"SELECT COUNT(*) FROM ({statement_prefix} {where_clause})").bindparams(*bind_params)
+    count_statement = text(f"SELECT COUNT(*) {statement_from} {where_clause}").bindparams(*bind_params)
 
     count_result = await db.operate_return_scalar_one(count_statement, statement_params)
 

{ezkit-1.12.44 → ezkit-1.12.46/ezKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezKit
-Version: 1.12.44
+Version: 1.12.46
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.12.44 → ezkit-1.12.46}/setup.py

@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="ezKit",
-    version="1.12.44",
+    version="1.12.46",
     author="septvean",
     author_email="septvean@gmail.com",
     description="Easy Kit",