ezKit 1.12.12__py3-none-any.whl → 1.12.14__py3-none-any.whl

ezKit/database.py

@@ -10,11 +10,11 @@
 import csv
 import json
 from datetime import date, datetime
-from typing import Any, Type
+from typing import Any, Dict, Optional, Tuple, Type
 
 import pandas as pd
 from loguru import logger
-from sqlalchemy import CursorResult, Engine, Index, create_engine, text
+from sqlalchemy import CursorResult, Engine, Index, bindparam, create_engine, text
 from sqlalchemy.orm import DeclarativeBase, Session, declarative_base
 
 from . import utils
@@ -109,21 +109,23 @@ def orm_to_dict(obj, include: list | None = None) -> dict | list | None:
 # --------------------------------------------------------------------------------------------------
 
 
-def build_raw_where_clause(data: dict) -> tuple[str, list] | None:
+def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, Any], list]]:
     """
-    将字段数据转换为 SQL WHERE 条件(使用原生 SQL)
-    支持字段后缀操作: __like, __gt, __lt, __ne, __in, __between
-    返回值: SQL字符串和参数列表 (为了避免 SQL 注入风险, 不直接返回 SQL 语句)
+    构建 SQLAlchemy 原生 SQL 查询的 WHERE 子句与绑定参数 (text + :param_name)
+    - 支持操作符: __like, __ge, __gt, __lt, __ne, __in, __between
+    - 支持 PostgreSQL 对 date 字段的特殊处理
+    - 返回: (SQL 子句字符串, 参数 dict, bindparams 列表)
     """
 
     try:
 
         sql_parts = []
-        params = []
+        param_dict = {}
+        bind_params = []
 
         for field, value in data.items():
 
-            # PostgreSQL: 日期特殊处理
+            # 特殊处理日期字段
             if field == "date" or field.startswith("date__"):
                 field = field.replace("date", "datetime::date", 1)
 
@@ -131,34 +133,55 @@ def build_raw_where_clause(data: dict) -> tuple[str, list] | None:
 
                 base, op = field.split("__", 1)
 
+                # 避免字段名冲突
+                param_key = f"{base}_{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 %s")
-                    params.append(f"%{value}%")
+                    sql_parts.append(f"{base} LIKE :{param_key}")
+                    param_dict[param_key] = f"%{value}%"
+                elif op == "ge":
+                    sql_parts.append(f"{base} >= :{param_key}")
+                    param_dict[param_key] = value
                 elif op == "gt":
-                    sql_parts.append(f"{base} > %s")
-                    params.append(value)
+                    sql_parts.append(f"{base} > :{param_key}")
+                    param_dict[param_key] = value
+                elif op == "le":
+                    sql_parts.append(f"{base} <= :{param_key}")
+                    param_dict[param_key] = value
                 elif op == "lt":
-                    sql_parts.append(f"{base} < %s")
-                    params.append(value)
+                    sql_parts.append(f"{base} < :{param_key}")
+                    param_dict[param_key] = value
                 elif op == "ne":
-                    sql_parts.append(f"{base} != %s")
-                    params.append(value)
+                    sql_parts.append(f"{base} != :{param_key}")
+                    param_dict[param_key] = value
                 elif op == "in" and isinstance(value, list):
-                    placeholders = ", ".join(["%s"] * len(value))
-                    sql_parts.append(f"{base} IN ({placeholders})")
-                    params.extend(value)
+                    sql_parts.append(f"{base} IN :{param_key}")
+                    param_dict[param_key] = value
+                    bind_params.append(bindparam(param_key, expanding=True))
                 elif op == "between" and isinstance(value, list) and len(value) == 2:
-                    sql_parts.append(f"{base} BETWEEN %s AND %s")
-                    params.extend(value)
+                    sql_parts.append(f"{base} BETWEEN :{param_key}_start AND :{param_key}_end")
+                    param_dict[f"{param_key}_start"] = value[0]
+                    param_dict[f"{param_key}_end"] = value[1]
 
             else:
 
-                sql_parts.append(f"{field} = %s")
-                params.append(value)
+                param_key = field
+
+                # 特殊处理日期字段
+                if param_key.startswith("datetime::date"):
+                    param_key = param_key.replace("datetime::date", "datetime_date", 1)
+
+                sql_parts.append(f"{field} = :{param_key}")
+
+                param_dict[param_key] = value
 
         where_clause = " AND ".join(sql_parts)
 
-        return where_clause, params
+        return where_clause, param_dict, bind_params
 
     except Exception as e:
         logger.exception(e)

{ezkit-1.12.12.dist-info → ezkit-1.12.14.dist-info}/METADATA

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

{ezkit-1.12.12.dist-info → ezkit-1.12.14.dist-info}/RECORD

@@ -3,7 +3,7 @@ ezKit/_file.py,sha256=0qRZhwYuagTgTGrhm-tzAMvEQT4HTJA_xZKqF2bo0ho,1207
 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=gHpU2E2zd3GGQpTXPkpyClySAdnab-AxTwCPyQGiAqs,18757
+ezKit/database.py,sha256=HK-TquMmlzPlRsiqmnXTGxQrrSHiRx65oOHoE6c4M84,19926
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/http.py,sha256=zhNxJF-x91UqGncXWxVXnhZVpFo_wmmpGnMXVT11y9E,1832
 ezKit/markdown_to_html.template,sha256=21G2sSVGJn6aJvHd0NN4zY5YiDteKe4UtW36AzBwSdk,22274
@@ -15,8 +15,8 @@ ezKit/token.py,sha256=Ac-i9xfq4TqpGyfCzakjrh4NYzxHiN2sCQrMk1tzVi8,1716
 ezKit/utils.py,sha256=VyAw2yEs15VER9RCpMgskx1l0zrSpRlV34X___eOia0,42416
 ezKit/xftp.py,sha256=-XQXyhMqeigT63P6sXkSS7r4GROXyqqlkzKxITLWG-g,8278
 ezKit/zabbix.py,sha256=PkMnfu7mcuotwwIIsHaC9FsNg-gap6hD1xvm0AwSL1Y,33777
-ezkit-1.12.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.12.dist-info/METADATA,sha256=9et1FbKkXxWKuH0_yvzg4uzdolFHs8419tkwMMs4FZo,317
-ezkit-1.12.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.12.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.12.dist-info/RECORD,,
+ezkit-1.12.14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.14.dist-info/METADATA,sha256=aXP1h-OH37Q4mhrUOAW9WnN6sUkEiz4Mvf5swf--IbY,317
+ezkit-1.12.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.14.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.14.dist-info/RECORD,,