fix: wrap transaction in an outer pipeline if the connection has one

Before entering a transaction on a connection in pipeline mode, we open an
outer pipeline to ensure that a Sync is after the transaction exists;
similarly to the inner pipeline, this is to ensure that the connection
state is restored at transaction exit similarly to the non-pipeline
case. The inner pipeline is not enough because we need to account for
the exit transaction statement (COMMIT or ROLLBACK) and then sync its
result.

This fixes transactions tests failing in previous commit.

diff --git a/psycopg/psycopg/connection.py b/psycopg/psycopg/connection.py
index a80ab619dda69f219eff16863e23ffe5791eb90a..7ecae04c80553ba5a16cb9955ce6f6870de1e687 100644 (file)
--- a/psycopg/psycopg/connection.py
+++ b/psycopg/psycopg/connection.py
@@ -872,7 +872,7 @@ class Connection(BaseConnection[Row]):
         tx = Transaction(self, savepoint_name, force_rollback)
         if self._pipeline:
             self._pipeline.sync()
-            with tx, self.pipeline():
+            with self.pipeline(), tx, self.pipeline():
                 yield tx
         else:
             with tx:

diff --git a/psycopg/psycopg/connection_async.py b/psycopg/psycopg/connection_async.py
index 6e8fab8bc7a171d897d3acc2b87e5374fa260eac..a4eee8f5c02394a80db9361c838e42a7c2a8835a 100644 (file)
--- a/psycopg/psycopg/connection_async.py
+++ b/psycopg/psycopg/connection_async.py
@@ -284,7 +284,7 @@ class AsyncConnection(BaseConnection[Row]):
         tx = AsyncTransaction(self, savepoint_name, force_rollback)
         if self._pipeline:
             await self._pipeline.sync()
-            async with tx, self.pipeline():
+            async with self.pipeline(), tx, self.pipeline():
                 yield tx
         else:
             async with tx: