cr1

enso-org · Apr 26, 2023 · 56fd463 · 56fd463
1 parent e40a4a2
commit 56fd463
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 2 deletions.
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Panic.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Panic.enso
@@ -133,6 +133,10 @@ type Panic
 
        This emulates the `finally` clause in Java.
 
+       If an exception occurs in the `finalizer`, it is propagated. If `action`
+       throws an exception and the `finalizer` also throws an exception, the
+       exception thrown by `finalizer` takes precedence.
+
        > Example
          Print the `Cleaning...` message regardless of if the action succeeds.
              do_cleanup =

diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Errors.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Errors.enso
@@ -155,7 +155,6 @@ type Non_Unique_Primary_Key
 
        Arguments:
        - primary_key: The primary key that is not unique.
-       # TODO [RW] should we include `duplicate_rows` here to show example ids of rows that are not unique?
     Error (primary_key : Vector Text)
 
     ## PRIVATE

diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso
@@ -136,6 +136,8 @@ type JDBC_Connection
        Once the action is completed, the transaction is committed.
        If a panic escapes from the action, the transaction is rolled-back and
        closed.
+       If the rollback fails and panics, the panic related to the rollback will
+       take precedence over the original panic that caused that rollback.
     run_within_transaction : Any -> Any
     run_within_transaction self ~action =
         self.run_without_autocommit <|

diff --git a/...es/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java b/...es/enso-test-java-helpers/src/main/java/org/enso/table_test_helpers/ExplodingStorage.java
@@ -11,6 +11,10 @@
 import java.util.BitSet;
 import java.util.List;
 
+/**
+ * A helper class used in the Upload_Spec test to purposefully interrupt a table upload in the
+ * middle of it by throwing an exception. It is used to test the transactionality of the upload.
+ */
 public class ExplodingStorage extends Storage<Long> {
   private final long[] array;
   private final long explodingIndex;

diff --git a/test/Tests/src/Semantic/Error_Spec.enso b/test/Tests/src/Semantic/Error_Spec.enso
@@ -289,7 +289,7 @@ spec =
 
             caught_js_arr_panic . should_equal "JS array:[1, 2, 3]"
 
-        Test.specify "should allow to use with_finalizer" <|
+        Test.specify "should allow to use `with_finalizer`" <|
             ref1 = Ref.new ""
             r1 = Panic.with_finalizer (ref1.put "finalized") <|
                 42
@@ -311,4 +311,29 @@ spec =
             r3.should_fail_with Illegal_Argument
             ref3.get . should_equal "finalized"
 
+        Test.specify "should propagate any panics raised in `with_finalizer` finalization" <|
+            v1 = Vector.new_builder
+            c1 = Panic.catch Any handler=(.payload) <|
+                do_finalize =
+                    v1.append 2
+                    Panic.throw "finalizer"
+                do_act =
+                    v1.append 1
+                    42
+                Panic.with_finalizer do_finalize do_act
+            c1 . should_equal "finalizer"
+            v1.to_vector . should_equal [1, 2]
+
+            v2 = Vector.new_builder
+            c2 = Panic.catch Any handler=(.payload) <|
+                do_finalize =
+                    v2.append 2
+                    Panic.throw "finalizer"
+                do_act =
+                    v2.append 1
+                    Panic.throw "action"
+                Panic.with_finalizer do_finalize do_act
+            c2 . should_equal "finalizer"
+            v2.to_vector . should_equal [1, 2]
+
 main = Test_Suite.run_main spec