Fix query regression

porsager · porsager · commit 9b96e2b8e5c8 · 2019-12-10T10:09:38.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -106,14 +106,13 @@ function Connection(options = {}) {
         ? prepared(statements.get(sig), args, query)
         : prepare(sig, str, args, query)
 
-    if (ready && !backend.query) {
-      backend.query = query
-      socket.write(buffer)
-    } else {
-      queries.push(query)
-      messages.push(buffer)
-      !ready && socket.connect()
-    }
+    backend.query || !ready
+      ? queries.push(query)
+      : (backend.query = query)
+
+    ready
+      ? socket.write(buffer)
+      : (messages.push(buffer), socket.connect())
   }
 
   function simple(str, query) {
diff --git a/tests/index.js b/tests/index.js
@@ -492,3 +492,14 @@ t('connection parameters', async() => {
 
   return ['yay', (await sql`select current_setting('some.var') as x`)[0].x]
 })
+
+t('Multiple queries', async() => {
+  const sql = postgres(options)
+
+  return [4, (await Promise.all([
+    sql`select 1`,
+    sql`select 2`,
+    sql`select 3`,
+    sql`select 4`
+  ])).length]
+})
