v0.1.0a1

Author: amisadmin

pyproject.toml

@@ -36,6 +36,7 @@ classifiers = [
 ]
 dependencies = [
     "sqlalchemy",
+    "sqlalchemy2-stubs>=0.0.2a29"
 ]
 
 [project.urls]

sqlalchemy_database/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.11"
+__version__ = "0.1.0a1"
 __url__ = "https://github.com/amisadmin/sqlalchemy_database"
 
 from sqlalchemy_database._abc_async_database import AbcAsyncDatabase

tests/conftest.py

@@ -9,8 +9,8 @@
 from sqlalchemy_database import AsyncDatabase, Database
 
 # sqlite
-sync_db = Database.create("sqlite:///amisadmin.db?check_same_thread=False", echo=True)
-async_db = AsyncDatabase.create("sqlite+aiosqlite:///amisadmin.db?check_same_thread=False", echo=True)
+sync_db = Database.create("sqlite:///amisadmin.db?check_same_thread=False")
+async_db = AsyncDatabase.create("sqlite+aiosqlite:///amisadmin.db?check_same_thread=False")
 
 # mysql
 # sync_db = Database.create('mysql+pymysql://root:123456@127.0.0.1:3306/amisadmin?charset=utf8mb4')
@@ -50,13 +50,10 @@ class Group(Base):
 
 @pytest.fixture
 async def prepare_database() -> AsyncGenerator[None, None]:
-    _db = AsyncDatabase.create(async_db.engine.url)
-
-    await _db.async_run_sync(Base.metadata.drop_all, is_session=False)
-    await _db.async_run_sync(Base.metadata.create_all, is_session=False)
+    await async_db.async_run_sync(Base.metadata.create_all, is_session=False)
     yield
-    await _db.async_close()
-    await _db.async_run_sync(Base.metadata.drop_all, is_session=False)
+    await async_db.async_run_sync(Base.metadata.drop_all, is_session=False)
+    await async_db.async_close()
 
 
 @pytest.fixture

tests/test_Database.py

@@ -119,7 +119,6 @@ def test_ThreadPoolExecutor():
     task_count = 40
     pool = ThreadPoolExecutor(max_workers=20)  # 创建线程池,设置最大线程数
     all_task = [pool.submit(test_session_context_var, k) for k in range(task_count)]  # 投递任务
-    # print(all_task)
     done, fail = wait(all_task, return_when=ALL_COMPLETED)  # 等待线程运行完毕
     results = {task.result() for task in done}
     assert len(results) == task_count

tests/test_fastapi.py

@@ -13,7 +13,6 @@
 
 
 def get_users() -> List[User]:
-    print("get_users", id(sync_db.session))
     assert sync_db.session is not global_sync_session
     users = sync_db.session.scalars(select(User))
     """1. If the session is used in a non-dependency function, the session is global.