Fix race condition with transactions on end

Author: porsager

cjs/src/connection.js

@@ -535,9 +535,11 @@ function Connection(options, { onopen = noop, onend = noop, ondrain = noop, oncl
       return // Consider opening if able and sent.length < 50
 
     connection.reserved
-      ? x[5] === 73
-        ? ending && terminate()
-        : connection.reserved() // I
+      ? x[5] === 73 // I
+        ? ending
+          ? terminate()
+          : (connection.reserved = null, onopen(connection))
+        : connection.reserved()
       : ending
         ? terminate()
         : onopen(connection)

cjs/src/index.js

@@ -193,11 +193,6 @@ function Postgres(a, b) {
       return await scope(connection, fn)
     } catch (error) {
       throw error
-    } finally {
-      if (connection) {
-        connection.reserved = null
-        onopen(connection)
-      }
     }
 
     async function scope(c, fn, name) {

cjs/tests/index.js

@@ -1921,3 +1921,16 @@ t('Prevent premature end of connection in transaction', async() => {
     result
   ]
 })
+
+t('Ensure reconnect after max_lifetime with transactions', { timeout: 5000 }, async() => {
+  const sql = postgres({
+    max_lifetime: 0.01,
+    idle_timeout,
+    max: 1
+  })
+
+  let x = 0
+  while (x++ < 10) await sql.begin(sql => sql`select 1 as x`)
+
+  return [true, true]
+})

deno/src/connection.js

@@ -538,9 +538,11 @@ function Connection(options, { onopen = noop, onend = noop, ondrain = noop, oncl
       return // Consider opening if able and sent.length < 50
 
     connection.reserved
-      ? x[5] === 73
-        ? ending && terminate()
-        : connection.reserved() // I
+      ? x[5] === 73 // I
+        ? ending
+          ? terminate()
+          : (connection.reserved = null, onopen(connection))
+        : connection.reserved()
       : ending
         ? terminate()
         : onopen(connection)

deno/src/index.js

@@ -194,11 +194,6 @@ function Postgres(a, b) {
       return await scope(connection, fn)
     } catch (error) {
       throw error
-    } finally {
-      if (connection) {
-        connection.reserved = null
-        onopen(connection)
-      }
     }
 
     async function scope(c, fn, name) {

deno/tests/index.js

@@ -1922,3 +1922,16 @@ t('Prevent premature end of connection in transaction', async() => {
     result
   ]
 })
+
+t('Ensure reconnect after max_lifetime with transactions', { timeout: 5000 }, async() => {
+  const sql = postgres({
+    max_lifetime: 0.01,
+    idle_timeout,
+    max: 1
+  })
+
+  let x = 0
+  while (x++ < 10) await sql.begin(sql => sql`select 1 as x`)
+
+  return [true, true]
+})

src/connection.js

@@ -535,9 +535,11 @@ function Connection(options, { onopen = noop, onend = noop, ondrain = noop, oncl
       return // Consider opening if able and sent.length < 50
 
     connection.reserved
-      ? x[5] === 73
-        ? ending && terminate()
-        : connection.reserved() // I
+      ? x[5] === 73 // I
+        ? ending
+          ? terminate()
+          : (connection.reserved = null, onopen(connection))
+        : connection.reserved()
       : ending
         ? terminate()
         : onopen(connection)

src/index.js

@@ -193,11 +193,6 @@ function Postgres(a, b) {
       return await scope(connection, fn)
     } catch (error) {
       throw error
-    } finally {
-      if (connection) {
-        connection.reserved = null
-        onopen(connection)
-      }
     }
 
     async function scope(c, fn, name) {

tests/index.js

@@ -1921,3 +1921,16 @@ t('Prevent premature end of connection in transaction', async() => {
     result
   ]
 })
+
+t('Ensure reconnect after max_lifetime with transactions', { timeout: 5000 }, async() => {
+  const sql = postgres({
+    max_lifetime: 0.01,
+    idle_timeout,
+    max: 1
+  })
+
+  let x = 0
+  while (x++ < 10) await sql.begin(sql => sql`select 1 as x`)
+
+  return [true, true]
+})