postgres.git / summary / log / commit / refs

commit    9438962ce32fd2fa437b5a447c40c5dac2ef9f08
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Sat Jun 05 05:16:34 2021 +0000
First released in: 9.6.23, 10.18, 11.13, 12.8, 13.4

    Fix subtransaction test for Python 3.10
    
    Starting with Python 3.10, the stacktrace looks differently:
      -  PL/Python function "subtransaction_exit_subtransaction_in_with", line 3, in <module>
      -    s.__exit__(None, None, None)
      +  PL/Python function "subtransaction_exit_subtransaction_in_with", line 2, in <module>
      +    with plpy.subtransaction() as s:
    Using try/except specifically makes the error look always the same.
    
    (See https://github.com/python/cpython/pull/25719 for the discussion
    of this change in Python.)
    
    Author: Honza Horak <hhorak@redhat.com>
    Discussion: https://www.postgresql.org/message-id/flat/853083.1620749597%40sss.pgh.pa.us
    RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1959080


 src/pl/plpython/expected/plpython_subtransaction.out | 11 +++++++----
 src/pl/plpython/sql/plpython_subtransaction.sql      |  7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pl/plpython/expected/plpython_subtransaction.out b/src/pl/plpython/expected/plpython_subtransaction.out
index 069f0992abd..d36aac127bb 100644
--- a/src/pl/plpython/expected/plpython_subtransaction.out
+++ b/src/pl/plpython/expected/plpython_subtransaction.out
@@ -236,8 +236,11 @@ with plpy.subtransaction() as s:
 $$ LANGUAGE plpythonu;
 CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void
 AS $$
-with plpy.subtransaction() as s:
-    s.__exit__(None, None, None)
+try:
+    with plpy.subtransaction() as s:
+        s.__exit__(None, None, None)
+except ValueError as e:
+    raise ValueError(e)
 $$ LANGUAGE plpythonu;
 SELECT subtransaction_exit_without_enter();
 ERROR:  ValueError: this subtransaction has not been entered
@@ -289,8 +292,8 @@ PL/Python function "subtransaction_enter_subtransaction_in_with"
 SELECT subtransaction_exit_subtransaction_in_with();
 ERROR:  ValueError: this subtransaction has already been exited
 CONTEXT:  Traceback (most recent call last):
-  PL/Python function "subtransaction_exit_subtransaction_in_with", line 3, in <module>
-    s.__exit__(None, None, None)
+  PL/Python function "subtransaction_exit_subtransaction_in_with", line 6, in <module>
+    raise ValueError(e)
 PL/Python function "subtransaction_exit_subtransaction_in_with"
 -- Make sure we don't get a "current transaction is aborted" error
 SELECT 1 as test;
diff --git a/src/pl/plpython/sql/plpython_subtransaction.sql b/src/pl/plpython/sql/plpython_subtransaction.sql
index 398c65720ce..572930f8bf2 100644
--- a/src/pl/plpython/sql/plpython_subtransaction.sql
+++ b/src/pl/plpython/sql/plpython_subtransaction.sql
@@ -158,8 +158,11 @@ $$ LANGUAGE plpythonu;
 
 CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void
 AS $$
-with plpy.subtransaction() as s:
-    s.__exit__(None, None, None)
+try:
+    with plpy.subtransaction() as s:
+        s.__exit__(None, None, None)
+except ValueError as e:
+    raise ValueError(e)
 $$ LANGUAGE plpythonu;
 
 SELECT subtransaction_exit_without_enter();


[parent: eb231dbd80d2]