Use raise_with_backtrace in with_transaction

This stores the original exception backtrace and re-raises after the async rollback (which destroys the global stack trace). Fixes with_transaction losing stack traces finally.
arenadotio · Jun 20, 2018 · 7eb0f4c · 7eb0f4c
1 parent 2f29549
commit 7eb0f4c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: ocaml/opam:ubuntu-17.04_ocaml-4.04.2
+      - image: ocaml/opam:ubuntu-17.04_ocaml-4.05.0
         environment:
           PGUSER: pgx
           PGDATABASE: pgx-test

diff --git a/pgx.opam b/pgx.opam
@@ -22,4 +22,4 @@ depends: [
   "ounit" {test}
 ]
 
-available: [ocaml-version >= "4.04.2"]
+available: [ocaml-version >= "4.05.0"]
diff --git a/pgx/src/pgx.ml b/pgx/src/pgx.ml
@@ -1392,8 +1392,9 @@ module Make (Thread : IO) = struct
          return r
       )
       (fun e ->
+         let backtrace = Printexc.get_raw_backtrace () in
          rollback conn >>= fun () ->
-         reraise e
+         Printexc.raise_with_backtrace e backtrace
       )
 
   let execute_many conn ~query ~params =

diff --git a/pgx_async.opam b/pgx_async.opam
@@ -18,4 +18,4 @@ depends: [
   "ounit" {test}
 ]
 
-available: [ocaml-version >= "4.04.2"]
+available: [ocaml-version >= "4.05.0"]
diff --git a/pgx_lwt.opam b/pgx_lwt.opam
@@ -18,4 +18,4 @@ depends: [
   "ounit" {test}
 ]
 
-available: [ocaml-version >= "4.04.2"]
+available: [ocaml-version >= "4.05.0"]
diff --git a/pgx_unix.opam b/pgx_unix.opam
@@ -17,4 +17,4 @@ depends: [
   "ounit" {test}
 ]
 
-available: [ocaml-version >= "4.04.2"]
+available: [ocaml-version >= "4.05.0"]