SQL.execute and AsyncSQL.execute better handle rollback outside of tr…

…ansaction
kruxia · Sep 17, 2023 · 92508ff · 92508ff
1 parent 430c2f5
commit 92508ff
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/sqly/sql.py b/sqly/sql.py
@@ -173,9 +173,11 @@ def execute(
         except Exception as exc:
             # If the connection is a cursor, get the underlying connection to rollback,
             # because cursors don't have a rollback method.
-            if hasattr(connection, "connection"):
-                connection = connection.connection
-            connection.rollback()
+            if hasattr(connection, "rollback"):
+                try:
+                    connection.rollback()
+                except Exception:
+                    ...
             raise exc
 
         return cursor
@@ -238,9 +240,11 @@ async def execute(
         except Exception as exc:
             # If the connection is a cursor, get the underlying connection to rollback,
             # because cursors don't have a rollback method.
-            if hasattr(connection, "connection"):
-                connection = connection.connection
-            await connection.rollback()
+            if hasattr(connection, "rollback"):
+                try:
+                    await connection.rollback()
+                except Exception:
+                    ...
             raise exc
 
         return cursor