ezKit 1.12.46__tar.gz → 1.12.48__tar.gz

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

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

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

@@ -9,6 +9,7 @@
 
 import csv
 import json
+import re
 from copy import deepcopy
 from datetime import date, datetime
 from typing import Any, Dict, List, Optional, Tuple, Type
@@ -216,11 +217,18 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
         param_dict = {}
         bind_params = []
 
+        pattern_date = re.compile(r"(^|\.)(datetime_date)(__|$)")
+
         for field, value in _data.items():
 
             # 特殊处理日期字段
-            is_date_field = field == "date" or field.startswith("date__")
-            base_field = field.replace("date", "datetime::date", 1) if is_date_field else field
+            # 如果匹配到 datetime_date 或者 .datetime_date 或者 datetime_date__ 或者 .datetime_date__ 就替换
+            # is_date_field = field == "datetime_date" or field.startswith("datetime_date__")
+            # base_field = field.replace("datetime_date", "datetime::date", 1) if is_date_field else field
+            if pattern_date.search(field):
+                base_field = pattern_date.sub(r"\1datetime::date\3", field, count=1)
+            else:
+                base_field = field
 
             if "__" in base_field:
 
@@ -248,11 +256,16 @@ 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 = base_field.replace(".", "_")
                 # 特殊处理日期字段
-                if param_key.startswith("datetime::date"):
-                    param_key = param_key.replace("datetime::date", "datetime_date", 1)
+                # 如果匹配到 datetime_date 或者 .datetime_date 或者 datetime_date__ 或者 .datetime_date__ 就替换
+                # if param_key.startswith("datetime::date"):
+                #     param_key = param_key.replace("datetime::date", "datetime_date", 1)
+                if pattern_date.search(param_key):
+                    param_key = pattern_date.sub(r"\1datetime::date\3", param_key, count=1)
                 sql_parts.append(f"{base_field} = :{param_key}")
                 param_dict[param_key] = value
 

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

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

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

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