database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

Update plpython_subtransaction alternative expected files

Browse Source 
The original patch only targeted Python 2.6 and newer, since that is
what we have supported in PostgreSQL 13 and newer.  For older
branches, we need to fix it up for older Python versions.
This commit is contained in:
Peter Eisentraut 2021-06-17 16:37:13 +02:00
parent 009ee51af7
commit ec52b886d1
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pl/plpython/expected/plpython_subtransaction.out
View File

@ -239,7 +239,7 @@ AS $$
try: try:
with plpy.subtransaction() as s: with plpy.subtransaction() as s:
s.__exit__(None, None, None) s.__exit__(None, None, None)
except ValueError as e: except ValueError, e:
raise ValueError(e) raise ValueError(e)
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
SELECT subtransaction_exit_without_enter(); SELECT subtransaction_exit_without_enter();

9
src/pl/plpython/expected/plpython_subtransaction_0.out
View File

@ -222,11 +222,14 @@ ERROR: could not compile PL/Python function "subtransaction_enter_subtransactio
DETAIL: SyntaxError: invalid syntax (line 3) DETAIL: SyntaxError: invalid syntax (line 3)
CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void
AS $$ AS $$
with plpy.subtransaction() as s: try:
s.__exit__(None, None, None) with plpy.subtransaction() as s:
s.__exit__(None, None, None)
except ValueError, e:
raise ValueError(e)
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
ERROR: could not compile PL/Python function "subtransaction_exit_subtransaction_in_with" ERROR: could not compile PL/Python function "subtransaction_exit_subtransaction_in_with"
DETAIL: SyntaxError: invalid syntax (line 3) DETAIL: SyntaxError: invalid syntax (line 4)
SELECT subtransaction_exit_without_enter(); SELECT subtransaction_exit_without_enter();
ERROR: ValueError: this subtransaction has not been entered ERROR: ValueError: this subtransaction has not been entered
CONTEXT: Traceback (most recent call last): CONTEXT: Traceback (most recent call last):

9
src/pl/plpython/expected/plpython_subtransaction_5.out
View File

@ -222,11 +222,14 @@ ERROR: could not compile PL/Python function "subtransaction_enter_subtransactio
DETAIL: SyntaxError: invalid syntax (<string>, line 3) DETAIL: SyntaxError: invalid syntax (<string>, line 3)
CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void
AS $$ AS $$
with plpy.subtransaction() as s: try:
s.__exit__(None, None, None) with plpy.subtransaction() as s:
s.__exit__(None, None, None)
except ValueError, e:
raise ValueError(e)
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
ERROR: could not compile PL/Python function "subtransaction_exit_subtransaction_in_with" ERROR: could not compile PL/Python function "subtransaction_exit_subtransaction_in_with"
DETAIL: SyntaxError: invalid syntax (<string>, line 3) DETAIL: SyntaxError: invalid syntax (<string>, line 4)
SELECT subtransaction_exit_without_enter(); SELECT subtransaction_exit_without_enter();
ERROR: ValueError: this subtransaction has not been entered ERROR: ValueError: this subtransaction has not been entered
CONTEXT: Traceback (most recent call last): CONTEXT: Traceback (most recent call last):

2
src/pl/plpython/sql/plpython_subtransaction.sql
View File

@ -161,7 +161,7 @@ AS $$
try: try:
with plpy.subtransaction() as s: with plpy.subtransaction() as s:
s.__exit__(None, None, None) s.__exit__(None, None, None)
except ValueError as e: except ValueError, e:
raise ValueError(e) raise ValueError(e)
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;