Improved ORM tests

Author: mongkok

tests/panels/sqlalchemy/conftest.py

@@ -24,9 +24,9 @@ def get_db() -> t.Generator:
 def client(app: FastAPI, get_index: t.Callable) -> TestClient:
     @app.get("/sql", response_class=HTMLResponse)
     async def get_sql(request: Request, db: Session = Depends(get_db)) -> str:
-        create_user(db=db, username="test")
-        get_user(db=db, user_id=1)
-        get_user(db=db, user_id=1)
+        user = create_user(db=db, username="test")
+        get_user(db=db, user_id=user.id)
+        get_user(db=db, user_id=user.id)
         return get_index(request)
 
     return TestClient(app)

tests/panels/sqlalchemy/database.py

@@ -1,7 +1,12 @@
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
+from sqlalchemy.pool import StaticPool
 
-engine = create_engine("sqlite://", connect_args={"check_same_thread": False})
+engine = create_engine(
+    "sqlite://",
+    connect_args={"check_same_thread": False},
+    poolclass=StaticPool,
+)
 SessionLocal = sessionmaker(bind=engine)
 Base = declarative_base()

tests/panels/sqlalchemy/test_sqlalchemy.py

@@ -9,6 +9,6 @@ def test_sqlalchemy(client: TestClient) -> None:
     stats = client.get_stats(store_id, "SQLAlchemyPanel")
     queries = stats["queries"]
 
-    assert len(queries) == 3
+    assert len(queries) == 4
     assert queries[0][1]["sql"].startswith("INSERT")
-    assert queries[1][1]["dup_count"] == 2
+    assert queries[2][1]["dup_count"] == 2

tests/panels/tortoise/conftest.py

@@ -16,9 +16,9 @@ async def client(
 ) -> t.AsyncGenerator[TestClient, None]:
     @app.get("/sql", response_class=HTMLResponse)
     async def get_sql(request: Request) -> str:
-        await create_user(username="test")
-        await get_user(user_id=1)
-        await get_user(user_id=1)
+        user = await create_user(username="test")
+        await get_user(user_id=user.id)
+        await get_user(user_id=user.id)
         return get_index(request)
 
     await Tortoise.init(