Ensure drain only dequeues if ready - fixes porsager#303

porsager · porsager · commit 3f9118b8d004 · 2022-04-05T11:37:31.000+02:00
diff --git a/cjs/src/connection.js b/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) {
diff --git a/cjs/tests/index.js b/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]
+})
diff --git a/deno/src/connection.js b/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) {
diff --git a/deno/tests/index.js b/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))
diff --git a/src/connection.js b/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) {
diff --git a/tests/index.js b/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]
+})

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose`
`299`	`299`
`300`	`300`	`/* c8 ignore next 3 */`
`301`	`301`	`function drain() {`
`302`		`- onopen(connection)`
	`302`	`+ !query && onopen(connection)`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`function data(x) {`
Original file line number	Diff line number	Diff line change
`@@ -1977,3 +1977,14 @@ t('Custom socket works', {}, async() => {`
`1977`	`1977`	`82`
`1978`	`1978`	`]`
`1979`	`1979`	`})`
	`1980`	`+`
	`1981`	`+t('Ensure drain only dequeues if ready', async() => {`
	`1982`	`+ const sql = postgres(options)`
	`1983`	`+`
	`1984`	`+ const res = await Promise.all([`
	`1985`	`+ sql.unsafe('SELECT 0+$1 --' + '.'.repeat(100000), [1]),`
	`1986`	`+ sql.unsafe('SELECT 0+$1+$2+$3', [1, 2, 3])`
	`1987`	`+ ])`
	`1988`	`+`
	`1989`	`+ return [res.length, 2]`
	`1990`	`+})`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose`
`302`	`302`
`303`	`303`	`/* c8 ignore next 3 */`
`304`	`304`	`function drain() {`
`305`		`- onopen(connection)`
	`305`	`+ !query && onopen(connection)`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`function data(x) {`