ezKit 1.12.7__tar.gz → 1.12.9__tar.gz

{ezkit-1.12.7/ezKit.egg-info → ezkit-1.12.9}/PKG-INFO

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

{ezkit-1.12.7 → ezkit-1.12.9}/ezKit/database.py

@@ -14,7 +14,7 @@ from typing import Any, Type
 
 import pandas as pd
 from loguru import logger
-from sqlalchemy import CursorResult, Index, create_engine, text
+from sqlalchemy import CursorResult, Engine, Index, create_engine, text
 from sqlalchemy.orm import DeclarativeBase, Session, declarative_base
 
 from . import utils
@@ -67,14 +67,71 @@ def orm_to_dict(obj, include: list | None = None) -> dict | list | None:
         return None
 
 
+def build_raw_where_clause(data: dict) -> tuple[str, list] | None:
+    """
+    将字段数据转换为 SQL WHERE 条件(使用原生 SQL)
+    支持字段后缀操作: __like, __gt, __lt, __ne, __in, __between
+    返回值: SQL字符串和参数列表 (为了避免 SQL 注入风险, 不直接返回 SQL 语句)
+    """
+
+    try:
+
+        sql_parts = []
+        params = []
+
+        for field, value in data.items():
+
+            if "__" in field:
+
+                base, op = field.split("__", 1)
+
+                if op == "like":
+                    sql_parts.append(f"{base} LIKE %s")
+                    params.append(f"%{value}%")
+                elif op == "gt":
+                    sql_parts.append(f"{base} > %s")
+                    params.append(value)
+                elif op == "lt":
+                    sql_parts.append(f"{base} < %s")
+                    params.append(value)
+                elif op == "ne":
+                    sql_parts.append(f"{base} != %s")
+                    params.append(value)
+                elif op == "in" and isinstance(value, list):
+                    placeholders = ", ".join(["%s"] * len(value))
+                    sql_parts.append(f"{base} IN ({placeholders})")
+                    params.extend(value)
+                elif op == "between" and isinstance(value, list) and len(value) == 2:
+                    sql_parts.append(f"{base} BETWEEN %s AND %s")
+                    params.extend(value)
+
+            else:
+
+                sql_parts.append(f"{field} = %s")
+                params.append(value)
+
+        where_clause = " AND ".join(sql_parts)
+
+        return where_clause, params
+
+    except Exception as e:
+        logger.exception(e)
+        return None
+
+
+# --------------------------------------------------------------------------------------------------
+
+
 class Database:
     """Database"""
 
     engine = create_engine("sqlite://")
 
-    def __init__(self, target: str | None = None, **options):
+    def __init__(self, engine: Engine | None = None, target: str | None = None, **options):
         """Initiation"""
-        if isinstance(target, str) and utils.isTrue(target, str):
+        if engine is not None:
+            self.engine = engine
+        elif isinstance(target, str) and utils.isTrue(target, str):
             if utils.isTrue(options, dict):
                 self.engine = create_engine(target, **options)
             else:

{ezkit-1.12.7 → ezkit-1.12.9/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.12.7 → ezkit-1.12.9}/setup.py

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