ezKit 1.12.31__tar.gz → 1.12.33__tar.gz

{ezkit-1.12.31/ezKit.egg-info → ezkit-1.12.33}/PKG-INFO

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

{ezkit-1.12.31 → ezkit-1.12.33}/ezKit/database.py

@@ -723,7 +723,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 +754,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 +797,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 +847,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.31 → ezkit-1.12.33}/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.31 → ezkit-1.12.33/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.12.31 → ezkit-1.12.33}/setup.py

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