ezKit 1.12.42__py3-none-any.whl → 1.12.44__py3-none-any.whl

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.dist-info → ezkit-1.12.44.dist-info}/METADATA

@@ -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.dist-info → ezkit-1.12.44.dist-info}/RECORD

@@ -4,7 +4,7 @@ ezKit/auth.py,sha256=HO19O4qOz68e0YwOP04habxMCAk42B3D7LW7yKgm9ZA,398
 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=IOxAj3n_2b8ehZaCKbTcufw59GiOj5SNFxyE6odjRE4,32498
+ezKit/database.py,sha256=nYvh0mv1nPgJbFb3k5sheN7QS5IBTpCnqjYxINnX1As,32666
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/errors.py,sha256=92PggwPQfTS3Vg4og7GHYnO9CTSM7zmuh2w3kx_tSBE,1425
 ezKit/fastapix.py,sha256=-nz565ASKvp3nGs9J4wORTHxlhMozqCwv8zREWpmYtI,3382
@@ -18,8 +18,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.42.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.42.dist-info/METADATA,sha256=BMLaxldMSZtBS3l_BPrgQvD-V9b89kCQqs9ViD4XHds,317
-ezkit-1.12.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.42.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.42.dist-info/RECORD,,
+ezkit-1.12.44.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.44.dist-info/METADATA,sha256=jw1B3wvM_rwcY8ae71N-MM2QY2I3XEmhKn5eStoVWwA,317
+ezkit-1.12.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.44.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.44.dist-info/RECORD,,