ezKit 1.12.45__tar.gz → 1.12.47__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. {ezkit-1.12.45/ezKit.egg-info → ezkit-1.12.47}/PKG-INFO +1 -1
  2. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/database.py +11 -2
  3. {ezkit-1.12.45 → ezkit-1.12.47/ezKit.egg-info}/PKG-INFO +1 -1
  4. {ezkit-1.12.45 → ezkit-1.12.47}/setup.py +1 -1
  5. {ezkit-1.12.45 → ezkit-1.12.47}/LICENSE +0 -0
  6. {ezkit-1.12.45 → ezkit-1.12.47}/MANIFEST.in +0 -0
  7. {ezkit-1.12.45 → ezkit-1.12.47}/README.md +0 -0
  8. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/__init__.py +0 -0
  9. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/_file.py +0 -0
  10. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/auth.py +0 -0
  11. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/bottle.py +0 -0
  12. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/bottle_extensions.py +0 -0
  13. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/cipher.py +0 -0
  14. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/dockerhub.py +0 -0
  15. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/errors.py +0 -0
  16. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/fastapix.py +0 -0
  17. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/http.py +0 -0
  18. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/markdown_to_html.template +0 -0
  19. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/mongo.py +0 -0
  20. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/qywx.py +0 -0
  21. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/redis.py +0 -0
  22. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/sendemail.py +0 -0
  23. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/token.py +0 -0
  24. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/utils.py +0 -0
  25. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/xftp.py +0 -0
  26. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit/zabbix.py +0 -0
  27. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit.egg-info/SOURCES.txt +0 -0
  28. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit.egg-info/dependency_links.txt +0 -0
  29. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit.egg-info/requires.txt +0 -0
  30. {ezkit-1.12.45 → ezkit-1.12.47}/ezKit.egg-info/top_level.txt +0 -0
  31. {ezkit-1.12.45 → ezkit-1.12.47}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ezKit
3
- Version: 1.12.45
3
+ Version: 1.12.47
4
4
  Summary: Easy Kit
5
5
  Author: septvean
6
6
  Author-email: septvean@gmail.com
@@ -219,8 +219,8 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
219
219
  for field, value in _data.items():
220
220
 
221
221
  # 特殊处理日期字段
222
- is_date_field = field == "date" or field.startswith("date__")
223
- base_field = field.replace("date", "datetime::date", 1) if is_date_field else field
222
+ is_date_field = field == "datetime_date" or field.startswith("datetime_date__")
223
+ base_field = field.replace("datetime_date", "datetime::date", 1) if is_date_field else field
224
224
 
225
225
  if "__" in base_field:
226
226
 
@@ -229,6 +229,10 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
229
229
  # 避免字段名冲突
230
230
  param_key = f"{base.replace('.', '_')}_{op}"
231
231
 
232
+ # 特殊处理日期字段
233
+ if param_key.startswith("datetime::date"):
234
+ param_key = param_key.replace("datetime::date", "datetime_date", 1)
235
+
232
236
  if op == "like":
233
237
  sql_parts.append(f"{base} LIKE :{param_key}")
234
238
  param_dict[param_key] = f"%{value}%"
@@ -244,8 +248,13 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
244
248
  sql_parts.append(f"{base} BETWEEN :{param_key}_start AND :{param_key}_end")
245
249
  param_dict[f"{param_key}_start"] = value[0]
246
250
  param_dict[f"{param_key}_end"] = value[1]
251
+
247
252
  else:
253
+
248
254
  param_key = base_field.replace(".", "_")
255
+ # 特殊处理日期字段
256
+ if param_key.startswith("datetime::date"):
257
+ param_key = param_key.replace("datetime::date", "datetime_date", 1)
249
258
  sql_parts.append(f"{base_field} = :{param_key}")
250
259
  param_dict[param_key] = value
251
260
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ezKit
3
- Version: 1.12.45
3
+ Version: 1.12.47
4
4
  Summary: Easy Kit
5
5
  Author: septvean
6
6
  Author-email: septvean@gmail.com
@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
4
4
 
5
5
  setup(
6
6
  name="ezKit",
7
- version="1.12.45",
7
+ version="1.12.47",
8
8
  author="septvean",
9
9
  author_email="septvean@gmail.com",
10
10
  description="Easy Kit",
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes