From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Wed, 10 Feb 2021 17:49:06 +0000 (+0100)
Subject: Don't clobber error leaving a ServerCursor block with a broken connection
X-Git-Tag: 3.0.dev0~115^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f782c4f73b9119599968cf17b2b2e5f741ccf9c2;p=thirdparty%2Fpsycopg.git

Don't clobber error leaving a ServerCursor block with a broken connection
---

diff --git a/psycopg3/psycopg3/server_cursor.py b/psycopg3/psycopg3/server_cursor.py
index 065967de5..289485edc 100644
--- a/psycopg3/psycopg3/server_cursor.py
+++ b/psycopg3/psycopg3/server_cursor.py
@@ -72,6 +72,13 @@ class ServerCursorHelper(Generic[ConnectionType]):
         self.described = True
 
     def _close_gen(self, cur: BaseCursor[ConnectionType]) -> PQGen[None]:
+        # if the connection is not in a sane state, don't even try
+        if cur._conn.pgconn.transaction_status not in (
+            pq.TransactionStatus.IDLE,
+            pq.TransactionStatus.INTRANS,
+        ):
+            return
+
         # if we didn't declare the cursor ourselves we still have to close it
         # but we must make sure it exists.
         if not self.described:
diff --git a/tests/test_server_cursor.py b/tests/test_server_cursor.py
index fa9bbd12a..ff9c2559b 100644
--- a/tests/test_server_cursor.py
+++ b/tests/test_server_cursor.py
@@ -1,5 +1,6 @@
 import pytest
 
+from psycopg3 import errors as e
 from psycopg3.pq import Format
 
 
@@ -80,6 +81,12 @@ def test_context(conn, recwarn):
     assert not recwarn
 
 
+def test_close_no_clobber(conn):
+    with pytest.raises(e.DivisionByZero):
+        with conn.cursor("foo") as cur:
+            cur.execute("select 1 / %s", (0,))
+
+
 def test_warn_close(conn, recwarn):
     cur = conn.cursor("foo")
     cur.execute("select generate_series(1, 10) as bar")
@@ -89,7 +96,7 @@ def test_warn_close(conn, recwarn):
 
 def test_executemany(conn):
     cur = conn.cursor("foo")
-    with pytest.raises(conn.NotSupportedError):
+    with pytest.raises(e.NotSupportedError):
         cur.executemany("select %s", [(1,), (2,)])
 
 
@@ -182,7 +189,7 @@ def test_itersize(conn, commands):
 
 def test_scroll(conn):
     cur = conn.cursor("tmp")
-    with pytest.raises(conn.ProgrammingError):
+    with pytest.raises(e.ProgrammingError):
         cur.scroll(0)
 
     cur.execute("select generate_series(0,9)")
@@ -213,7 +220,7 @@ def test_non_scrollable(conn):
     curs = conn.cursor("foo")
     curs.execute("select generate_series(0, 5)", scrollable=False)
     curs.scroll(5)
-    with pytest.raises(conn.OperationalError):
+    with pytest.raises(e.OperationalError):
         curs.scroll(-1)
 
 
diff --git a/tests/test_server_cursor_async.py b/tests/test_server_cursor_async.py
index ace61771b..685c55928 100644
--- a/tests/test_server_cursor_async.py
+++ b/tests/test_server_cursor_async.py
@@ -1,5 +1,6 @@
 import pytest
 
+from psycopg3 import errors as e
 from psycopg3.pq import Format
 
 pytestmark = pytest.mark.asyncio
@@ -82,6 +83,12 @@ async def test_context(aconn, recwarn):
     assert not recwarn
 
 
+async def test_close_no_clobber(aconn):
+    with pytest.raises(e.DivisionByZero):
+        async with aconn.cursor("foo") as cur:
+            await cur.execute("select 1 / %s", (0,))
+
+
 async def test_warn_close(aconn, recwarn):
     cur = aconn.cursor("foo")
     await cur.execute("select generate_series(1, 10) as bar")
@@ -91,7 +98,7 @@ async def test_warn_close(aconn, recwarn):
 
 async def test_executemany(aconn):
     cur = aconn.cursor("foo")
-    with pytest.raises(aconn.NotSupportedError):
+    with pytest.raises(e.NotSupportedError):
         await cur.executemany("select %s", [(1,), (2,)])
 
 
@@ -189,7 +196,7 @@ async def test_itersize(aconn, acommands):
 
 async def test_scroll(aconn):
     cur = aconn.cursor("tmp")
-    with pytest.raises(aconn.ProgrammingError):
+    with pytest.raises(e.ProgrammingError):
         await cur.scroll(0)
 
     await cur.execute("select generate_series(0,9)")
@@ -220,7 +227,7 @@ async def test_non_scrollable(aconn):
     curs = aconn.cursor("foo")
     await curs.execute("select generate_series(0, 5)", scrollable=False)
     await curs.scroll(5)
-    with pytest.raises(aconn.OperationalError):
+    with pytest.raises(e.OperationalError):
         await curs.scroll(-1)