build

Author: porsager

cf/src/connection.js

@@ -111,7 +111,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     queue: queues.closed,
     idleTimer,
     connect(query) {
-      initial = query || true
+      initial = query
       reconnect()
     },
     terminate,
@@ -383,10 +383,13 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   function errored(err) {
     stream && (stream.destroy(err), stream = null)
     query && queryError(query, err)
-    initial && (initial.reserve ? initial.reject(err) : queryError(initial, err), initial = null)
+    initial && (queryError(initial, err), initial = null)
   }
 
   function queryError(query, err) {
+    if (query.reserve)
+      return query.reject(err)
+
     if (!err || typeof err !== 'object')
       err = new Error(err)
 
@@ -537,11 +540,11 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       }
 
       if (needsTypes) {
-        initial === true && (initial = null)
+        initial.reserve && (initial = null)
         return fetchArrayTypes()
       }
 
-      initial !== true && execute(initial)
+      initial && !initial.reserve && execute(initial)
       options.shared.retries = retries = 0
       initial = null
       return

cjs/src/connection.js

@@ -109,7 +109,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     queue: queues.closed,
     idleTimer,
     connect(query) {
-      initial = query || true
+      initial = query
       reconnect()
     },
     terminate,
@@ -381,10 +381,13 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   function errored(err) {
     stream && (stream.destroy(err), stream = null)
     query && queryError(query, err)
-    initial && (initial.reserve ? initial.reject(err) : queryError(initial, err), initial = null)
+    initial && (queryError(initial, err), initial = null)
   }
 
   function queryError(query, err) {
+    if (query.reserve)
+      return query.reject(err)
+
     if (!err || typeof err !== 'object')
       err = new Error(err)
 
@@ -535,11 +538,11 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       }
 
       if (needsTypes) {
-        initial === true && (initial = null)
+        initial.reserve && (initial = null)
         return fetchArrayTypes()
       }
 
-      initial !== true && execute(initial)
+      initial && !initial.reserve && execute(initial)
       options.shared.retries = retries = 0
       initial = null
       return

cjs/tests/index.js

@@ -445,7 +445,7 @@ t('Proper handling of null Errors', async() => {
   ]
 })
 
-t('Ensure reserve throws proper error', async() => {
+t('Ensure reserve on connection throws proper error', async() => {
   const sql = postgres({ socket: () => { throw 'wat' }, idle_timeout }) // eslint-disable-line
 
   return [
@@ -2604,3 +2604,13 @@ t('arrays in reserved connection', async() => {
     x.join('')
   ]
 })
+
+t('Ensure reserve on query throws proper error', async() => {
+  const sql = postgres({ idle_timeout }) // eslint-disable-line
+  const reserved = await sql.reserve()
+  const [{ x }] = await reserved`select 'wat' as x`
+
+  return [
+    'wat', x, reserved.release()
+  ]
+})

deno/src/connection.js

@@ -112,7 +112,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     queue: queues.closed,
     idleTimer,
     connect(query) {
-      initial = query || true
+      initial = query
       reconnect()
     },
     terminate,
@@ -384,10 +384,13 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   function errored(err) {
     stream && (stream.destroy(err), stream = null)
     query && queryError(query, err)
-    initial && (initial.reserve ? initial.reject(err) : queryError(initial, err), initial = null)
+    initial && (queryError(initial, err), initial = null)
   }
 
   function queryError(query, err) {
+    if (query.reserve)
+      return query.reject(err)
+
     if (!err || typeof err !== 'object')
       err = new Error(err)
 
@@ -538,11 +541,11 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       }
 
       if (needsTypes) {
-        initial === true && (initial = null)
+        initial.reserve && (initial = null)
         return fetchArrayTypes()
       }
 
-      initial !== true && execute(initial)
+      initial && !initial.reserve && execute(initial)
       options.shared.retries = retries = 0
       initial = null
       return

deno/tests/index.js

@@ -447,7 +447,7 @@ t('Proper handling of null Errors', async() => {
   ]
 })
 
-t('Ensure reserve throws proper error', async() => {
+t('Ensure reserve on connection throws proper error', async() => {
   const sql = postgres({ socket: () => { throw 'wat' }, idle_timeout }) // eslint-disable-line
 
   return [
@@ -2607,4 +2607,14 @@ t('arrays in reserved connection', async() => {
   ]
 })
 
+t('Ensure reserve on query throws proper error', async() => {
+  const sql = postgres({ idle_timeout }) // eslint-disable-line
+  const reserved = await sql.reserve()
+  const [{ x }] = await reserved`select 'wat' as x`
+
+  return [
+    'wat', x, reserved.release()
+  ]
+})
+
 ;globalThis.addEventListener("unload", () => Deno.exit(process.exitCode))