ezKit 1.12.47__tar.gz → 1.12.49__tar.gz

{ezkit-1.12.47/ezKit.egg-info → ezkit-1.12.49}/PKG-INFO

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

{ezkit-1.12.47 → ezkit-1.12.49}/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
@@ -128,6 +129,21 @@ def orm_to_dict(obj, include: list | None = None) -> dict | list | None:
 # --------------------------------------------------------------------------------------------------
 
 
+def replace_datetime(source: str, to_pgsql: bool = True) -> str:
+    """
+    替换 datetime_date <-> datetime::date
+    to_pgsql=True  : datetime_date -> datetime::date
+    to_pgsql=False : datetime::date -> datetime_date
+    """
+
+    if to_pgsql:
+        pattern = re.compile(r"(^|\.)(datetime_date)(__|$)")
+        return pattern.sub(r"\1datetime::date\3", source, count=1)
+
+    pattern = re.compile(r"(^|\.)(datetime::date)$")
+    return pattern.sub(r"\1datetime_date\3", source, count=1)
+
+
 def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, Any], list]]:
     """
     构建 SQLAlchemy 原生 SQL 查询的 WHERE 子句与绑定参数 (text + :param_name)
@@ -219,8 +235,15 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
         for field, value in _data.items():
 
             # 特殊处理日期字段
-            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
+            # 如果匹配到 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
+            pattern_date_field = re.compile(r"(^|\.)(datetime_date)(__|$)")
+            if pattern_date_field.search(field):
+                # base_field = pattern_date.sub(r"\1datetime::date\3", field, count=1)
+                base_field = replace_datetime(field, to_pgsql=True)
+            else:
+                base_field = field
 
             if "__" in base_field:
 
@@ -230,8 +253,11 @@ 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 param_key.startswith("datetime::date"):
+                #     param_key = param_key.replace("datetime::date", "datetime_date", 1)
+                pattern_param_key = re.compile(r"(^|\.)(datetime::date)$")
+                if pattern_param_key.search(param_key):
+                    param_key = replace_datetime(param_key, to_pgsql=False)
 
                 if op == "like":
                     sql_parts.append(f"{base} LIKE :{param_key}")
@@ -253,8 +279,12 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
 
                 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)
+                pattern_param_key = re.compile(r"(^|\.)(datetime::date)$")
+                if pattern_param_key.search(param_key):
+                    param_key = replace_datetime(param_key, to_pgsql=False)
                 sql_parts.append(f"{base_field} = :{param_key}")
                 param_dict[param_key] = value
 

{ezkit-1.12.47 → ezkit-1.12.49/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.12.47 → ezkit-1.12.49}/setup.py

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