build

porsager · Nov 2, 2023 · 6121a0a · 6121a0a
1 parent c084a1c
commit 6121a0a
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/cf/src/connection.js b/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
+      initial = query || true
       reconnect()
     },
     terminate,
@@ -535,11 +535,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/cjs/src/connection.js b/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
+      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/cjs/tests/index.js b/cjs/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('')
+  ]
+})
diff --git a/deno/src/connection.js b/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
+      initial = query || true
       reconnect()
     },
     terminate,
@@ -536,11 +536,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/deno/tests/index.js b/deno/tests/index.js
@@ -2546,4 +2546,15 @@ t('reserve connection', async() => {
   ]
 })
 
+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('')
+  ]
+})
+
 ;window.addEventListener("unload", () => Deno.exit(process.exitCode))