Fix errors thrown on commit

porsager · May 15, 2022 · 99ddae4 · 99ddae4
1 parent 7e418cd
commit 99ddae4
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 12 deletions.
diff --git a/cjs/src/index.js b/cjs/src/index.js
@@ -210,18 +210,17 @@ function Postgres(a, b) {
       const sql = Sql(handler)
       sql.savepoint = savepoint
       let uncaughtError
+        , result
+
       name && await sql`savepoint ${ sql(name) }`
       try {
-        const result = await new Promise((resolve, reject) => {
+        result = await new Promise((resolve, reject) => {
           const x = fn(sql)
           Promise.resolve(Array.isArray(x) ? Promise.all(x) : x).then(resolve, reject)
         })
 
         if (uncaughtError)
           throw uncaughtError
-
-        !name && await sql`commit`
-        return result
       } catch (e) {
         await (name
           ? sql`rollback to ${ sql(name) }`
@@ -230,6 +229,9 @@ function Postgres(a, b) {
         throw e instanceof PostgresError && e.code === '25P02' && uncaughtError || e
       }
 
+      !name && await sql`commit`
+      return result
+
       function savepoint(name, fn) {
         if (name && Array.isArray(name.raw))
           return savepoint(sql => sql.apply(sql, arguments))

diff --git a/cjs/tests/index.js b/cjs/tests/index.js
@@ -2123,3 +2123,20 @@ t('Supports arrays of fragments', async() => {
     x
   ]
 })
+
+t('Does not try rollback when commit errors', async() => {
+  let notice = null
+  const sql = postgres({ ...options, onnotice: x => notice = x })
+  await sql`create table test(x int constraint test_constraint unique deferrable initially deferred)`
+
+  await sql.begin('isolation level serializable', async sql => {
+    await sql`insert into test values(1)`
+    await sql`insert into test values(1)`
+  }).catch(e => e)
+
+  return [
+    notice,
+    null,
+    await sql`drop table test`
+  ]
+})
diff --git a/deno/src/index.js b/deno/src/index.js
@@ -211,18 +211,17 @@ function Postgres(a, b) {
       const sql = Sql(handler)
       sql.savepoint = savepoint
       let uncaughtError
+        , result
+
       name && await sql`savepoint ${ sql(name) }`
       try {
-        const result = await new Promise((resolve, reject) => {
+        result = await new Promise((resolve, reject) => {
           const x = fn(sql)
           Promise.resolve(Array.isArray(x) ? Promise.all(x) : x).then(resolve, reject)
         })
 
         if (uncaughtError)
           throw uncaughtError
-
-        !name && await sql`commit`
-        return result
       } catch (e) {
         await (name
           ? sql`rollback to ${ sql(name) }`
@@ -231,6 +230,9 @@ function Postgres(a, b) {
         throw e instanceof PostgresError && e.code === '25P02' && uncaughtError || e
       }
 
+      !name && await sql`commit`
+      return result
+
       function savepoint(name, fn) {
         if (name && Array.isArray(name.raw))
           return savepoint(sql => sql.apply(sql, arguments))

diff --git a/deno/tests/index.js b/deno/tests/index.js
@@ -2126,4 +2126,21 @@ t('Supports arrays of fragments', async() => {
   ]
 })
 
+t('Does not try rollback when commit errors', async() => {
+  let notice = null
+  const sql = postgres({ ...options, onnotice: x => notice = x })
+  await sql`create table test(x int constraint test_constraint unique deferrable initially deferred)`
+
+  await sql.begin('isolation level serializable', async sql => {
+    await sql`insert into test values(1)`
+    await sql`insert into test values(1)`
+  }).catch(e => e)
+
+  return [
+    notice,
+    null,
+    await sql`drop table test`
+  ]
+})
+
 ;window.addEventListener("unload", () => Deno.exit(process.exitCode))
diff --git a/src/index.js b/src/index.js
@@ -210,18 +210,17 @@ function Postgres(a, b) {
       const sql = Sql(handler)
       sql.savepoint = savepoint
       let uncaughtError
+        , result
+
       name && await sql`savepoint ${ sql(name) }`
       try {
-        const result = await new Promise((resolve, reject) => {
+        result = await new Promise((resolve, reject) => {
           const x = fn(sql)
           Promise.resolve(Array.isArray(x) ? Promise.all(x) : x).then(resolve, reject)
         })
 
         if (uncaughtError)
           throw uncaughtError
-
-        !name && await sql`commit`
-        return result
       } catch (e) {
         await (name
           ? sql`rollback to ${ sql(name) }`
@@ -230,6 +229,9 @@ function Postgres(a, b) {
         throw e instanceof PostgresError && e.code === '25P02' && uncaughtError || e
       }
 
+      !name && await sql`commit`
+      return result
+
       function savepoint(name, fn) {
         if (name && Array.isArray(name.raw))
           return savepoint(sql => sql.apply(sql, arguments))

diff --git a/tests/index.js b/tests/index.js
@@ -2123,3 +2123,20 @@ t('Supports arrays of fragments', async() => {
     x
   ]
 })
+
+t('Does not try rollback when commit errors', async() => {
+  let notice = null
+  const sql = postgres({ ...options, onnotice: x => notice = x })
+  await sql`create table test(x int constraint test_constraint unique deferrable initially deferred)`
+
+  await sql.begin('isolation level serializable', async sql => {
+    await sql`insert into test values(1)`
+    await sql`insert into test values(1)`
+  }).catch(e => e)
+
+  return [
+    notice,
+    null,
+    await sql`drop table test`
+  ]
+})