ezKit 1.12.22__py3-none-any.whl → 1.12.24__py3-none-any.whl

ezKit/database.py

@@ -14,7 +14,7 @@ from typing import Any, Dict, List, Optional, Tuple, Type
 
 import pandas as pd
 from loguru import logger
-from sqlalchemy import CursorResult, Engine, Index, bindparam, create_engine, insert, text
+from sqlalchemy import CursorResult, Engine, Index, bindparam, create_engine, text
 from sqlalchemy.engine import Result
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 from sqlalchemy.orm import DeclarativeBase, Session, declarative_base
@@ -190,6 +190,67 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
         return None
 
 
+def build_sqlalchemy_select_where(data: dict) -> tuple | None:
+    """Build SQLAlchemy select WHERE"""
+
+    try:
+
+        # 获取分页参数 (从 data 中取出 pageIndex 和 pageSize, 剩余的为查询参数)
+
+        pageIndex = data.pop("pageIndex", 1)
+        pageSize = data.pop("pageSize", 10)
+
+        limit, offset = get_limit_offset(pageIndex, pageSize)
+
+        # 构建 WHERE
+
+        build_result = build_sqlalchemy_where_clause(data)
+
+        if build_result is None:
+            logger.error("Build SQLAlchemy WHERE clause error")
+            return None
+
+        where_clause, sql_params, bind_params = build_result
+
+        # 添加 WHERE 前缀
+        if isinstance(where_clause, str) and where_clause.strip():
+            where_clause = f"WHERE {where_clause.strip()}"
+
+        # 分页参数
+        sql_params["limit"] = limit
+        sql_params["offset"] = offset
+
+        return where_clause, sql_params, bind_params
+
+    except Exception as e:
+        logger.exception(e)
+        return None
+
+
+def build_sqlalchemy_update(tablename: str, where_data: dict, update_data: dict) -> tuple | None:
+    """Build SQLAlchemy update"""
+
+    # 构建 WHERE
+
+    build_result = build_sqlalchemy_where_clause(where_data)
+
+    if build_result is None:
+        logger.error("Build SQLAlchemy WHERE clause error")
+        return None
+
+    where_clause, sql_params, bind_params = build_result
+
+    # 构建 UPDATE SQL 语句 (SET 中 key 的 value 的 key 添加后缀 _value, 避免与 where 冲突)
+    sql: str = f"UPDATE {tablename} SET " + ", ".join([f"{k} = :{k}_value" for k in update_data.keys()]) + f" WHERE {where_clause}"
+
+    # 合并数据 (key 添加后缀 _value, 与 SQL 保持一致)
+    for k in update_data.keys():
+        sql_params[f"{k}_value"] = update_data[k]
+
+    # 返回 statement 和 params
+    return text(sql).bindparams(*bind_params), sql_params
+
+
 # --------------------------------------------------------------------------------------------------
 
 
@@ -604,8 +665,8 @@ class DatabaseAsyncSession:
 
     # 执行器 (CRUD都可以执行. 即可以执行原生SQL, 也可以执行ORM)
     #   statement: SQL 或者 insert(schema)等
-    #   params: List[dict]
-    async def operater(self, statement, params, **kwargs) -> Result | None:
+    #   params: List[dict] (非必要)
+    async def operater(self, statement, params: Any | None = None, **kwargs) -> Result | None:
 
         async with self.AsyncSessionLocal() as session:
 
@@ -619,14 +680,14 @@ class DatabaseAsyncSession:
                 return None
 
     # 精确返回一个标量结果 (适用于只返回一行数据的select, 比如 count 查询)
-    async def operate_return_scalar_one(self, statement, params, **kwargs) -> Any | None:
+    async def operate_return_scalar_one(self, statement, params: Any | None = None, **kwargs) -> Any | None:
         result = await self.operater(statement, params, **kwargs)
         if result is None:
             return None
         return result.scalar_one()
 
     # 返回所有结果 (适用于所有select)
-    async def operate_return_mappings_all(self, statement, params, **kwargs) -> List[Any]:
+    async def operate_return_mappings_all(self, statement, params: Any | None = None, **kwargs) -> List[Any]:
         result = await self.operater(statement, params, **kwargs)
         if result is None:
             return []

{ezkit-1.12.22.dist-info → ezkit-1.12.24.dist-info}/METADATA

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

{ezkit-1.12.22.dist-info → ezkit-1.12.24.dist-info}/RECORD

@@ -3,7 +3,7 @@ ezKit/_file.py,sha256=0qRZhwYuagTgTGrhm-tzAMvEQT4HTJA_xZKqF2bo0ho,1207
 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=FRBiGppnBVUL621gBpH0QQVweBNtthPYXdUVqjxy8UM,21675
+ezKit/database.py,sha256=5-hKwdRmjkvjaMR-c0Y71YL4RP8RZQMwcvTSRkDR12M,23625
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/http.py,sha256=zhNxJF-x91UqGncXWxVXnhZVpFo_wmmpGnMXVT11y9E,1832
 ezKit/markdown_to_html.template,sha256=21G2sSVGJn6aJvHd0NN4zY5YiDteKe4UtW36AzBwSdk,22274
@@ -15,8 +15,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.22.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.22.dist-info/METADATA,sha256=pP9V2RhAO6wobr0hoJ4O1w8wRmzlHct3x1T65oUBuSQ,317
-ezkit-1.12.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.22.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.22.dist-info/RECORD,,
+ezkit-1.12.24.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.24.dist-info/METADATA,sha256=hMehrY5rKRa8oHbzOJarQMHyPfyHVeJ3JlFFhNdYNbo,317
+ezkit-1.12.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.24.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.24.dist-info/RECORD,,