From 604bd3671121b51f977de146ed95484c2297fb3e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 1 Nov 2019 11:09:52 +0100 Subject: PG_FINALLY This gives an alternative way of catching exceptions, for the common case where the cleanup code is the same in the error and non-error cases. So instead of PG_TRY(); { ... code that might throw ereport(ERROR) ... } PG_CATCH(); { cleanup(); PG_RE_THROW(); } PG_END_TRY(); cleanup(); one can write PG_TRY(); { ... code that might throw ereport(ERROR) ... } PG_FINALLY(); { cleanup(); } PG_END_TRY(); Discussion: https://www.postgresql.org/message-id/flat/95a822c3-728b-af0e-d7e5-71890507ae0c%402ndquadrant.com --- src/pl/plpython/plpy_cursorobject.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/pl/plpython/plpy_cursorobject.c') diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c index e4d543a4d46..b44ce7e225f 100644 --- a/src/pl/plpython/plpy_cursorobject.c +++ b/src/pl/plpython/plpy_cursorobject.c @@ -228,13 +228,11 @@ PLy_cursor_plan(PyObject *ob, PyObject *args) plan->values[j] = PLy_output_convert(arg, elem, &isnull); nulls[j] = isnull ? 'n' : ' '; } - PG_CATCH(); + PG_FINALLY(); { Py_DECREF(elem); - PG_RE_THROW(); } PG_END_TRY(); - Py_DECREF(elem); } portal = SPI_cursor_open(NULL, plan->plan, plan->values, nulls, -- cgit v1.2.3