ezKit 1.12.49__tar.gz → 1.12.50__tar.gz

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

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

{ezkit-1.12.49 → ezkit-1.12.50}/ezKit/database.py

@@ -137,11 +137,11 @@ def replace_datetime(source: str, to_pgsql: bool = True) -> str:
     """
 
     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\2", source, count=1)
 
-    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", source, count=1)
 
 
 def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, Any], list]]:
@@ -238,7 +238,7 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
             # 如果匹配到 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)(__|$)")
+            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)
@@ -255,7 +255,7 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                 # 特殊处理日期字段
                 # if param_key.startswith("datetime::date"):
                 #     param_key = param_key.replace("datetime::date", "datetime_date", 1)
-                pattern_param_key = re.compile(r"(^|\.)(datetime::date)$")
+                pattern_param_key = re.compile(r"(^|_)datetime::date$")
                 if pattern_param_key.search(param_key):
                     param_key = replace_datetime(param_key, to_pgsql=False)
 
@@ -282,7 +282,7 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                 # 如果匹配到 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)$")
+                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}")

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

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

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

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