ezKit 1.12.38__tar.gz → 1.12.40__tar.gz

{ezkit-1.12.38/ezKit.egg-info → ezkit-1.12.40}/PKG-INFO

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

{ezkit-1.12.38 → ezkit-1.12.40}/ezKit/database.py

@@ -40,6 +40,7 @@ def get_limit_offset(page_index: int, page_size: int) -> tuple[int, int]:
         page_size (int): 每页数量, 必须 > 0
 
     返回:
+
         (limit, offset): limit 表示取多少条，offset 表示跳过多少条
     """
     try:
@@ -60,7 +61,7 @@ def get_limit_offset(page_index: int, page_size: int) -> tuple[int, int]:
 
     except Exception as e:
         logger.exception(e)
-        return 1, 10
+        return 10, 0
 
 
 # --------------------------------------------------------------------------------------------------
@@ -122,6 +123,78 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
     - 返回: (SQL 子句字符串, 参数 dict, bindparams 列表)
     """
 
+    # try:
+
+    #     _data = deepcopy(data)
+
+    #     sql_parts = []
+    #     param_dict = {}
+    #     bind_params = []
+
+    #     for field, value in _data.items():
+
+    #         # 特殊处理日期字段
+    #         if field == "date" or field.startswith("date__"):
+    #             field = field.replace("date", "datetime::date", 1)
+
+    #         if "__" in field:
+
+    #             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 :{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} > :{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} < :{param_key}")
+    #                 param_dict[param_key] = value
+    #             elif op == "ne":
+    #                 sql_parts.append(f"{base} != :{param_key}")
+    #                 param_dict[param_key] = value
+    #             elif op == "in" and isinstance(value, list):
+    #                 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 :{param_key}_start AND :{param_key}_end")
+    #                 param_dict[f"{param_key}_start"] = value[0]
+    #                 param_dict[f"{param_key}_end"] = value[1]
+
+    #         else:
+
+    #             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, param_dict, bind_params
+
+    # except Exception as e:
+    #     logger.exception(e)
+    #     return None
+
     try:
 
         _data = deepcopy(data)
@@ -133,37 +206,22 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
         for field, value in _data.items():
 
             # 特殊处理日期字段
-            if field == "date" or field.startswith("date__"):
-                field = field.replace("date", "datetime::date", 1)
+            is_date_field = field == "date" or field.startswith("date__")
+            base_field = field.replace("date", "datetime::date", 1) if is_date_field else field
 
-            if "__" in field:
+            if "__" in base_field:
 
-                base, op = field.split("__", 1)
+                base, op = base_field.split("__", 1)
 
                 # 避免字段名冲突
-                param_key = f"{base}_{op}"
-
-                # 特殊处理日期字段
-                if param_key.startswith("datetime::date"):
-                    param_key = param_key.replace("datetime::date", "datetime_date", 1)
+                param_key = f"{base.replace('.', '_')}_{op}"
 
                 if op == "like":
                     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} > :{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} < :{param_key}")
-                    param_dict[param_key] = value
-                elif op == "ne":
-                    sql_parts.append(f"{base} != :{param_key}")
+                elif op in ("ge", "gt", "le", "lt", "ne"):
+                    operator = {"ge": ">=", "gt": ">", "le": "<=", "lt": "<", "ne": "!="}[op]
+                    sql_parts.append(f"{base} {operator} :{param_key}")
                     param_dict[param_key] = value
                 elif op == "in" and isinstance(value, list):
                     sql_parts.append(f"{base} IN :{param_key}")
@@ -173,21 +231,12 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                     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:
-
-                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_key = base_field.replace(".", "_")
+                sql_parts.append(f"{base_field} = :{param_key}")
                 param_dict[param_key] = value
 
         where_clause = " AND ".join(sql_parts)
-
         return where_clause, param_dict, bind_params
 
     except Exception as e:

{ezkit-1.12.38 → ezkit-1.12.40}/ezKit/errors.py

@@ -26,7 +26,7 @@ database_error = {
     },
     "update": {
         "code": 3003,
-        "message": "Database create data error",
+        "message": "Database update data error",
     },
     "delete": {
         "code": 3004,

{ezkit-1.12.38 → ezkit-1.12.40/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.12.38 → ezkit-1.12.40}/setup.py

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