ezKit 1.12.42__tar.gz → 1.12.44__tar.gz

{ezkit-1.12.42/ezKit.egg-info → ezkit-1.12.44}/PKG-INFO

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

{ezkit-1.12.42 → ezkit-1.12.44}/ezKit/database.py

@@ -18,14 +18,19 @@ from loguru import logger
 from sqlalchemy import CursorResult, Engine, Index, bindparam, create_engine, insert, text
 from sqlalchemy.engine import Result
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
-from sqlalchemy.orm import DeclarativeBase, Session, declarative_base
+from sqlalchemy.orm import DeclarativeBase, Session
 
 from . import utils
 from .errors import database_error, sqlalchemy_error
 
 # --------------------------------------------------------------------------------------------------
 
-Base: DeclarativeBase = declarative_base()
+
+class Base(DeclarativeBase):
+    """所有 ORM 模型的基类"""
+
+    pass  # pylint: disable=unnecessary-pass
+
 
 # --------------------------------------------------------------------------------------------------
 
@@ -357,7 +362,7 @@ class Database:
 
     # ----------------------------------------------------------------------------------------------
 
-    def metadata_init(self, base: DeclarativeBase, **kwargs) -> bool:
+    def metadata_init(self, base: type[Base], **kwargs) -> bool:
         # https://stackoverflow.com/questions/19175311/how-to-create-only-one-table-with-sqlalchemy
         info = "Database init table"
         try:
@@ -785,7 +790,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:
+async def async_read_and_count(db: DatabaseAsyncSession, data: dict, statement_prefix: str, statement_end: str = "") -> dict:
 
     # 初始返回结果 (适用于 count 等于 0)
     result = {"count": 0, "list": [], "pageIndex": data["pageIndex"], "pageSize": 0}
@@ -805,7 +810,9 @@ async def async_read_and_count(db: DatabaseAsyncSession, table_name: str, data:
 
     # 统计 WHERE
 
-    count_statement = text(f"SELECT COUNT(*) FROM {table_name} {where_clause}").bindparams(*bind_params)
+    # table_name: str
+    # count_statement = text(f"SELECT COUNT(*) FROM {table_name} {where_clause}").bindparams(*bind_params)
+    count_statement = text(f"SELECT COUNT(*) FROM ({statement_prefix} {where_clause})").bindparams(*bind_params)
 
     count_result = await db.operate_return_scalar_one(count_statement, statement_params)
 

{ezkit-1.12.42 → ezkit-1.12.44/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.12.42 → ezkit-1.12.44}/setup.py

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