Proper open/ready separation

porsager · porsager · commit c1ce6aed890a · 2019-12-29T15:05:49.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -24,6 +24,7 @@ function Connection(options = {}) {
   let timer
   let statement_id = 1
   let ended
+  let open = false
   let ready = false
   let statements = {}
 
@@ -94,11 +95,11 @@ function Connection(options = {}) {
         ? prepared(statements[sig], args, query)
         : prepare(sig, str, args, query)
 
-    backend.query || !ready
-      ? queries.push(query)
-      : (backend.query = query)
-
     ready
+      ? (backend.query = query, ready = false)
+      : queries.push(query)
+
+    open
       ? socket.write(buffer)
       : (messages.push(buffer), socket.connect())
   }
@@ -137,13 +138,14 @@ function Connection(options = {}) {
     if (queries.length === 0 && ended)
       return ended()
 
-    if (!ready) {
+    if (!open) {
       messages.forEach(socket.write)
       messages = []
-      ready = true
+      open = true
     }
 
     backend.query = queries.shift()
+    ready = !backend.query
   }
 
   function data(x) {
@@ -164,7 +166,7 @@ function Connection(options = {}) {
   function close() {
     error(errors.connection('CLOSED', options))
     statements = {}
-    ready = false
+    open = ready = false
   }
 
   /* c8 ignore next */
