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/backend/commands/event_trigger.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/backend/commands/event_trigger.c') diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index f7ee9838f7f..0301ae1ddd9 100644 --- a/src/backend/commands/event_trigger.c +++ b/src/backend/commands/event_trigger.c @@ -934,13 +934,11 @@ EventTriggerSQLDrop(Node *parsetree) { EventTriggerInvoke(runlist, &trigdata); } - PG_CATCH(); + PG_FINALLY(); { currentEventTriggerState->in_sql_drop = false; - PG_RE_THROW(); } PG_END_TRY(); - currentEventTriggerState->in_sql_drop = false; /* Cleanup. */ list_free(runlist); @@ -1007,17 +1005,13 @@ EventTriggerTableRewrite(Node *parsetree, Oid tableOid, int reason) { EventTriggerInvoke(runlist, &trigdata); } - PG_CATCH(); + PG_FINALLY(); { currentEventTriggerState->table_rewrite_oid = InvalidOid; currentEventTriggerState->table_rewrite_reason = 0; - PG_RE_THROW(); } PG_END_TRY(); - currentEventTriggerState->table_rewrite_oid = InvalidOid; - currentEventTriggerState->table_rewrite_reason = 0; - /* Cleanup. */ list_free(runlist); -- cgit v1.2.3