Merge pull request #31 from sfrvn/detail-scalar-one

fix: scalar_one_or_none in detail
e-kondr01 · Oct 16, 2024 · 229d940 · 229d940
2 parents 8c0698e + eb1afb1
commit 229d940
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/fastapi_sqlalchemy_toolkit/model_manager.py b/fastapi_sqlalchemy_toolkit/model_manager.py
@@ -243,7 +243,9 @@ async def get(
 
         result = await session.execute(stmt)
         if base_stmt is None:
-            return result.scalars().first()
+            if order_by is not None:
+                return result.scalars().first()
+            return result.scalar_one_or_none()
         return result.first()
 
     async def get_or_404(