ezKit 1.12.44__py3-none-any.whl → 1.12.46__py3-none-any.whl

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.dist-info → ezkit-1.12.46.dist-info}/METADATA

@@ -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.dist-info → ezkit-1.12.46.dist-info}/RECORD

@@ -4,7 +4,7 @@ ezKit/auth.py,sha256=HO19O4qOz68e0YwOP04habxMCAk42B3D7LW7yKgm9ZA,398
 ezKit/bottle.py,sha256=43h4v1kzz6qrLvCt5IMN0H-gFtaT0koG9wETqteXsps,181666
 ezKit/bottle_extensions.py,sha256=27rogmfK7mL2qUSjXH79IMGZbCVULtYEikql_N9O6Zs,1165
 ezKit/cipher.py,sha256=7jBarRH7ukSYzkz-Anl8B8JzluhnRz4CLHidPRRj_cg,2939
-ezKit/database.py,sha256=nYvh0mv1nPgJbFb3k5sheN7QS5IBTpCnqjYxINnX1As,32666
+ezKit/database.py,sha256=g-tiw6pCUx8WQ6gKI3Oofz_JrJ3qIihUpu0HJkm7sRU,33145
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/errors.py,sha256=92PggwPQfTS3Vg4og7GHYnO9CTSM7zmuh2w3kx_tSBE,1425
 ezKit/fastapix.py,sha256=-nz565ASKvp3nGs9J4wORTHxlhMozqCwv8zREWpmYtI,3382
@@ -18,8 +18,8 @@ ezKit/token.py,sha256=Ac-i9xfq4TqpGyfCzakjrh4NYzxHiN2sCQrMk1tzVi8,1716
 ezKit/utils.py,sha256=U457ahFkxIXuB-qWvS3995xJs-LlkFIX5_ZWVgmL5cY,43130
 ezKit/xftp.py,sha256=-XQXyhMqeigT63P6sXkSS7r4GROXyqqlkzKxITLWG-g,8278
 ezKit/zabbix.py,sha256=PkMnfu7mcuotwwIIsHaC9FsNg-gap6hD1xvm0AwSL1Y,33777
-ezkit-1.12.44.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.44.dist-info/METADATA,sha256=jw1B3wvM_rwcY8ae71N-MM2QY2I3XEmhKn5eStoVWwA,317
-ezkit-1.12.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.44.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.44.dist-info/RECORD,,
+ezkit-1.12.46.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.46.dist-info/METADATA,sha256=J2uHv42pOZww34tMWdg7ABUiKWinOmxH3jymKWK13Tc,317
+ezkit-1.12.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.46.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.46.dist-info/RECORD,,