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/extension.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/backend/commands/extension.c') diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index f7202cc9e7d..a04b0c9e579 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -942,17 +942,13 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control, execute_sql_string(c_sql); } - PG_CATCH(); + PG_FINALLY(); { creating_extension = false; CurrentExtensionObject = InvalidOid; - PG_RE_THROW(); } PG_END_TRY(); - creating_extension = false; - CurrentExtensionObject = InvalidOid; - /* * Restore the GUC variables we set above. */ -- cgit v1.2.3