Ensure reserved connections are initialized properly - fixes #718

porsager · Nov 2, 2023 · c084a1c · tim-smart · Nov 5, 2023 · tim-smart
1 parent b25274c
commit c084a1c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/connection.js b/src/connection.js
@@ -109,7 +109,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     queue: queues.closed,
     idleTimer,
     connect(query) {
-      initial = query
+      initial = query || true
       reconnect()
     },
     terminate,
@@ -533,11 +533,14 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
           return terminate()
       }
 
-      if (needsTypes)
+      if (needsTypes) {
+        initial === true && (initial = null)
         return fetchArrayTypes()
+      }
 
-      execute(initial)
-      options.shared.retries = retries = initial = 0
+      initial !== true && execute(initial)
+      options.shared.retries = retries = 0
+      initial = null
       return
     }
 

diff --git a/tests/index.js b/tests/index.js
@@ -2543,3 +2543,14 @@ t('reserve connection', async() => {
     xs.map(x => x.x).join('')
   ]
 })
+
+t('arrays in reserved connection', async() => {
+  const reserved = await sql.reserve()
+  const [{ x }] = await reserved`select array[1, 2, 3] as x`
+  reserved.release()
+
+  return [
+    '123',
+    x.join('')
+  ]
+})