Fix issue with old sqlalchemy.orm.Query usage (#719)

uriyyo · Jun 27, 2023 · 78e0003 · 78e0003
1 parent 1a6a086
commit 78e0003
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/fastapi_pagination/ext/sqlalchemy.py b/fastapi_pagination/ext/sqlalchemy.py
@@ -222,7 +222,12 @@ def _old_paginate_sign(
         stacklevel=3,
     )
 
-    return query, query.session, params, transformer, additional_data, unique, subquery_count  # type: ignore
+    session = query.session
+
+    with suppress(AttributeError):
+        query = query._statement_20()  # type: ignore[attr-defined]
+
+    return query, session, params, transformer, additional_data, unique, subquery_count  # type: ignore
 
 
 def _new_paginate_sign(