Ensure drain only dequeues if ready - fixes #303

Author: porsager

cjs/src/connection.js

@@ -299,7 +299,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
   /* c8 ignore next 3 */
   function drain() {
-    onopen(connection)
+    !query && onopen(connection)
   }
 
   function data(x) {

cjs/tests/index.js

@@ -1977,3 +1977,14 @@ t('Custom socket works', {}, async() => {
     82
   ]
 })
+
+t('Ensure drain only dequeues if ready', async() => {
+  const sql = postgres(options)
+
+  const res = await Promise.all([
+    sql.unsafe('SELECT 0+$1 --' + '.'.repeat(100000), [1]),
+    sql.unsafe('SELECT 0+$1+$2+$3', [1, 2, 3])
+  ])
+
+  return [res.length, 2]
+})

deno/src/connection.js

@@ -302,7 +302,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
   /* c8 ignore next 3 */
   function drain() {
-    onopen(connection)
+    !query && onopen(connection)
   }
 
   function data(x) {

deno/tests/index.js

@@ -1980,4 +1980,15 @@ t('Custom socket works', {}, async() => {
   ]
 })
 
+t('Ensure drain only dequeues if ready', async() => {
+  const sql = postgres(options)
+
+  const res = await Promise.all([
+    sql.unsafe('SELECT 0+$1 --' + '.'.repeat(100000), [1]),
+    sql.unsafe('SELECT 0+$1+$2+$3', [1, 2, 3])
+  ])
+
+  return [res.length, 2]
+})
+
 ;window.addEventListener("unload", () => Deno.exit(process.exitCode))

src/connection.js

@@ -299,7 +299,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
   /* c8 ignore next 3 */
   function drain() {
-    onopen(connection)
+    !query && onopen(connection)
   }
 
   function data(x) {

tests/index.js

@@ -1977,3 +1977,14 @@ t('Custom socket works', {}, async() => {
     82
   ]
 })
+
+t('Ensure drain only dequeues if ready', async() => {
+  const sql = postgres(options)
+
+  const res = await Promise.all([
+    sql.unsafe('SELECT 0+$1 --' + '.'.repeat(100000), [1]),
+    sql.unsafe('SELECT 0+$1+$2+$3', [1, 2, 3])
+  ])
+
+  return [res.length, 2]
+})