ezKit 1.12.47__py3-none-any.whl → 1.12.49__py3-none-any.whl

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.dist-info → ezkit-1.12.49.dist-info}/METADATA

@@ -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.dist-info → ezkit-1.12.49.dist-info}/RECORD

@@ -4,7 +4,7 @@ ezKit/auth.py,sha256=HO19O4qOz68e0YwOP04habxMCAk42B3D7LW7yKgm9ZA,398
 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=fHqmFt1H81PELAsishcklzTnrvPovjgCFIVQK1aUlSA,33174
+ezKit/database.py,sha256=zXhbBd378w_dW_dLlq2lmTkw8ztzQJT1KKZDlEvWPrY,34688
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/errors.py,sha256=92PggwPQfTS3Vg4og7GHYnO9CTSM7zmuh2w3kx_tSBE,1425
 ezKit/fastapix.py,sha256=-nz565ASKvp3nGs9J4wORTHxlhMozqCwv8zREWpmYtI,3382
@@ -18,8 +18,8 @@ ezKit/token.py,sha256=Ac-i9xfq4TqpGyfCzakjrh4NYzxHiN2sCQrMk1tzVi8,1716
 ezKit/utils.py,sha256=U457ahFkxIXuB-qWvS3995xJs-LlkFIX5_ZWVgmL5cY,43130
 ezKit/xftp.py,sha256=-XQXyhMqeigT63P6sXkSS7r4GROXyqqlkzKxITLWG-g,8278
 ezKit/zabbix.py,sha256=PkMnfu7mcuotwwIIsHaC9FsNg-gap6hD1xvm0AwSL1Y,33777
-ezkit-1.12.47.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.47.dist-info/METADATA,sha256=zxEuLOG8ERjvqvcXxepBi4Va4BItBFOt2QGi6AwnNLc,317
-ezkit-1.12.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.47.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.47.dist-info/RECORD,,
+ezkit-1.12.49.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.49.dist-info/METADATA,sha256=3NWuPiRzLrVCrmKkSL1vH8CeMra-YkfSrfq8oZ5k34o,317
+ezkit-1.12.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.49.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.49.dist-info/RECORD,,