diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2019-11-01 11:09:52 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2019-11-01 11:18:03 +0100 |
| commit | 604bd3671121b51f977de146ed95484c2297fb3e (patch) | |
| tree | 829045453c054befb9d795c33765501e2f4522f3 /src/backend/commands/event_trigger.c | |
| parent | 73025140885c889410b9bfc4a30a3866396fc5db (diff) | |
| download | postgresql-604bd3671121b51f977de146ed95484c2297fb3e.tar.gz postgresql-604bd3671121b51f977de146ed95484c2297fb3e.zip | |
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
Diffstat (limited to 'src/backend/commands/event_trigger.c')
| -rw-r--r-- | src/backend/commands/event_trigger.c | 10 |
1 files changed, 2 insertions, 8 deletions
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); |