Add count and command to result

porsager · porsager · commit b73f93efe7ac · 2019-11-25T17:19:44.000+01:00
diff --git a/lib/backend.js b/lib/backend.js
@@ -81,7 +81,15 @@ function Backend({
     if (!backend.query)
       return
 
-    backend.query.result.count = +x.utf8Slice(5, x.length - 1).split(' ').pop() // eslint-disable-line
+    for (let i = x.length - 1; i > 0; i--) {
+      if (x[i] === 32 && x[i + 1] < 58 && backend.query.result.count === null)
+        backend.query.result.count = +x.utf8Slice(i + 1, x.length - 1) // eslint-disable-line
+      if (x[i - 1] >= 65) {
+        backend.query.result.command = x.utf8Slice(5, i)
+        break
+      }
+    }
+
     resolve(backend.query.stream
       ? backend.query.result.count
       : backend.query.result
diff --git a/lib/connection.js b/lib/connection.js
@@ -88,6 +88,7 @@ export default function Connection(options = {}) {
 
   function send(query, { sig, str, args = [] }) {
     query.result = []
+    query.result.count = null
     timeout && clearTimeout(timer)
     !connection.ready || backend.query
       ? queries.push(query)
