ezKit 1.12.30__py3-none-any.whl → 1.12.32__py3-none-any.whl

ezKit/database.py

@@ -705,7 +705,7 @@ class DatabaseAsyncSession:
 # --------------------------------------------------------------------------------------------------
 
 
-async def db_async_create(db: DatabaseAsyncSession, schema: Type[DeclarativeBase], data: list) -> dict:
+async def async_create_and_count(db: DatabaseAsyncSession, schema: Type[DeclarativeBase], data: list) -> dict:
 
     # 插入数据
     result = await db.operater(insert(schema), data)
@@ -720,7 +720,7 @@ async def db_async_create(db: DatabaseAsyncSession, schema: Type[DeclarativeBase
 # --------------------------------------------------------------------------------------------------
 
 
-async def db_async_read(db: DatabaseAsyncSession, table_name: str, data: dict, statement_prefix: str, statement_end: str = "") -> dict:
+async def async_read_and_count(db: DatabaseAsyncSession, table_name: str, data: dict, statement_prefix: str, statement_end: str = "") -> dict:
 
     # 初始返回结果 (适用于 count 等于 0)
     result = {"count": 0, "data": None, "pageIndex": data["pageIndex"], "pageSize": 0}
@@ -759,8 +759,6 @@ async def db_async_read(db: DatabaseAsyncSession, table_name: str, data: dict, s
             {statement_prefix}
             {where_clause}
             {statement_end}
-            LIMIT :limit
-            OFFSET :offset;
         """
     ).bindparams(*bind_params)
 
@@ -782,7 +780,7 @@ async def db_async_read(db: DatabaseAsyncSession, table_name: str, data: dict, s
 # --------------------------------------------------------------------------------------------------
 
 
-async def db_async_update(db: DatabaseAsyncSession, table_name: str, data: dict) -> dict:
+async def async_update_and_count(db: DatabaseAsyncSession, table_name: str, data: dict) -> dict:
 
     # 构建 WHERE
 
@@ -832,7 +830,7 @@ async def db_async_update(db: DatabaseAsyncSession, table_name: str, data: dict)
 # --------------------------------------------------------------------------------------------------
 
 
-async def db_async_delete(db: DatabaseAsyncSession, table_name: str, data: dict) -> dict:
+async def async_delete_and_count(db: DatabaseAsyncSession, table_name: str, data: dict) -> dict:
 
     # 构建 WHERE
 

ezKit/errors.py

@@ -32,6 +32,10 @@ database_error = {
         "code": 3004,
         "message": "Database delete data error",
     },
+    "no_data": {
+        "code": 3005,
+        "message": "Database no data found",
+    },
 }
 
 # SQLAlchemy错误: 4000

{ezkit-1.12.30.dist-info → ezkit-1.12.32.dist-info}/METADATA

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

{ezkit-1.12.30.dist-info → ezkit-1.12.32.dist-info}/RECORD

@@ -3,9 +3,9 @@ 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=5MsIYDhyN6VtQ8MJy7pbMGqeaXguy9DzRHgJ6NJD5Gs,30126
+ezKit/database.py,sha256=W3xV_0o317oRaxZJWt_XithwzfL5HcTiGOyqpj07qNk,30101
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
-ezKit/errors.py,sha256=wLLzJ-YWCdAUqdLzsHM-jfnfZJL9pHtZoG_O_bVNI_A,1334
+ezKit/errors.py,sha256=htTi7vKClHGHf2MX2G88PKr0zzUrFiUHEsrmfqj1Fx8,1425
 ezKit/fastapix.py,sha256=59wqVLqJxNVesZTAwAqkzkiMQHKQQbVUijFP-IDu4ws,2935
 ezKit/http.py,sha256=zhNxJF-x91UqGncXWxVXnhZVpFo_wmmpGnMXVT11y9E,1832
 ezKit/markdown_to_html.template,sha256=21G2sSVGJn6aJvHd0NN4zY5YiDteKe4UtW36AzBwSdk,22274
@@ -17,8 +17,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.30.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.30.dist-info/METADATA,sha256=WEAe_vtj_2i15McEoZWDdEOc94jA84vjbJ6-76Xji08,317
-ezkit-1.12.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.30.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.30.dist-info/RECORD,,
+ezkit-1.12.32.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.32.dist-info/METADATA,sha256=YSVQxTKSN7g4th4QouCU1AMt4wQtkJ2Dxps1cozIvJY,317
+ezkit-1.12.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.32.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.32.dist-info/RECORD,,