Don't leave connections in transaction after pool.check()

Close #144.

diff --git a/psycopg_pool/psycopg_pool/pool.py b/psycopg_pool/psycopg_pool/pool.py
index 27cc35fb774b35b2833fd8a9a1b632ed144b3e83..74dda9e7a56f13c5a890611fa7eb23b8de5afc41 100644 (file)
--- a/psycopg_pool/psycopg_pool/pool.py
+++ b/psycopg_pool/psycopg_pool/pool.py
@@ -358,6 +358,8 @@ class ConnectionPool(BasePool[Connection[Any]]):
             conn = conns.pop()
             try:
                 conn.execute("SELECT 1")
+                if conn.pgconn.transaction_status == TransactionStatus.INTRANS:
+                    conn.rollback()
             except Exception:
                 self._stats[self._CONNECTIONS_LOST] += 1
                 logger.warning("discarding broken connection: %s", conn)

diff --git a/psycopg_pool/psycopg_pool/pool_async.py b/psycopg_pool/psycopg_pool/pool_async.py
index ae161297812c66b5b61a83d3bf3d6e296885b985..f1da22240afd0a334a558d8bd4f67ca83177422d 100644 (file)
--- a/psycopg_pool/psycopg_pool/pool_async.py
+++ b/psycopg_pool/psycopg_pool/pool_async.py
@@ -294,6 +294,8 @@ class AsyncConnectionPool(BasePool[AsyncConnection[Any]]):
             conn = conns.pop()
             try:
                 await conn.execute("SELECT 1")
+                if conn.pgconn.transaction_status == TransactionStatus.INTRANS:
+                    await conn.rollback()
             except Exception:
                 self._stats[self._CONNECTIONS_LOST] += 1
                 logger.warning("discarding broken connection: %s", conn)

diff --git a/tests/pool/test_pool.py b/tests/pool/test_pool.py
index dfeca1d817aabb12d585f7495c226cb2849858d4..703bf70e0254b5f556c1393d38e9753e976b683e 100644 (file)
--- a/tests/pool/test_pool.py
+++ b/tests/pool/test_pool.py
@@ -910,6 +910,14 @@ def test_check(dsn, caplog):
         assert pid not in pids2
 
 
+def test_check_idle(dsn):
+    with pool.ConnectionPool(dsn, min_size=2) as p:
+        p.wait(1.0)
+        p.check()
+        with p.connection() as conn:
+            assert conn.info.transaction_status == TransactionStatus.IDLE
+
+
 @pytest.mark.skipif(
     sys.version_info >= (3, 7), reason="async pool supported from Python 3.7"
 )

diff --git a/tests/pool/test_pool_async.py b/tests/pool/test_pool_async.py
index a05fe82838caa0ea706f42383b150a91a0c34936..608c35e0cd26799e27532ff03421f5e769d3d3ce 100644 (file)
--- a/tests/pool/test_pool_async.py
+++ b/tests/pool/test_pool_async.py
@@ -907,6 +907,14 @@ async def test_check(dsn, caplog):
         assert pid not in pids2
 
 
+async def test_check_idle(dsn):
+    async with pool.AsyncConnectionPool(dsn, min_size=2) as p:
+        await p.wait(1.0)
+        await p.check()
+        async with p.connection() as conn:
+            assert conn.info.transaction_status == TransactionStatus.IDLE
+
+
 @pytest.mark.slow
 @pytest.mark.timing
 async def test_stats_measures(dsn):