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

ezKit/database.py

@@ -698,8 +698,12 @@ class DatabaseAsyncSession:
         result = await self.operater(statement, params, **kwargs)
         if result is None:
             return []
-        rows = result.mappings().all()
-        return [dict(row) for row in rows]
+        try:
+            rows = result.mappings().all()
+            return [dict(row) for row in rows]
+        except Exception as e:
+            logger.exception(e)
+            return []
 
 
 # --------------------------------------------------------------------------------------------------
@@ -723,7 +727,7 @@ async def async_create_and_count(db: DatabaseAsyncSession, schema: Type[Declarat
 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}
+    result = {"count": 0, "data": [], "pageIndex": data["pageIndex"], "pageSize": 0}
 
     # ----------------------------------------------------------------------------------------------
 
@@ -754,13 +758,7 @@ async def async_read_and_count(db: DatabaseAsyncSession, table_name: str, data:
 
     # 读取数据
 
-    read_statement = text(
-        f"""
-            {statement_prefix}
-            {where_clause}
-            {statement_end}
-        """
-    ).bindparams(*bind_params)
+    read_statement = text(f"{statement_prefix} {where_clause} {statement_end}").bindparams(*bind_params)
 
     read_result = await db.operate_return_mappings_all(read_statement, statement_params)
 
@@ -803,7 +801,7 @@ async def async_update_and_count(db: DatabaseAsyncSession, table_name: str, data
         return {"code": 1002, "data": None, "message": sqlalchemy_error["statement_params"]["message"]}
 
     if count_result == 0:
-        return {"code": 1003, "data": 0, "message": database_error["update"]["message"]}
+        return {"code": 1003, "data": 0, "message": database_error["no_data"]["message"]}
 
     # ----------------------------------------------------------------------------------------------
 
@@ -853,7 +851,7 @@ async def async_delete_and_count(db: DatabaseAsyncSession, table_name: str, data
         return {"code": 1002, "data": None, "message": sqlalchemy_error["statement_params"]["message"]}
 
     if count_result == 0:
-        return {"code": 1003, "data": 0, "message": database_error["delete"]["message"]}
+        return {"code": 1003, "data": 0, "message": database_error["no_data"]["message"]}
 
     # ----------------------------------------------------------------------------------------------
 

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

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

{ezkit-1.12.32.dist-info → ezkit-1.12.34.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=W3xV_0o317oRaxZJWt_XithwzfL5HcTiGOyqpj07qNk,30101
+ezKit/database.py,sha256=snbC_f9D1F4mRVpIDJb_LaD6dKNTFuj1pe_VrtZ58DA,30143
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/errors.py,sha256=htTi7vKClHGHf2MX2G88PKr0zzUrFiUHEsrmfqj1Fx8,1425
 ezKit/fastapix.py,sha256=59wqVLqJxNVesZTAwAqkzkiMQHKQQbVUijFP-IDu4ws,2935
@@ -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.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,,
+ezkit-1.12.34.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.34.dist-info/METADATA,sha256=PHKodiulBCEcmzlafkY7NrFhHmNkzS1YS4sw55rDqK0,317
+ezkit-1.12.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.34.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.34.dist-info/RECORD,,