Add count to result

porsager · porsager · commit b3c1dd5c2a16 · 2019-11-25T09:22:15.000+01:00
diff --git a/lib/backend.js b/lib/backend.js
@@ -15,7 +15,6 @@ function Backend({
   onnotice,
   onnotify
 }) {
-  let result = null
   let rows = 0
 
   const backend = Object.entries({
@@ -79,12 +78,14 @@ function Backend({
   }
 
   function CommandComplete(x) {
-    backend.query && resolve(backend.query.stream
-      ? rows + 1
-      : result
+    if (!backend.query)
+      return
+
+    backend.query.result.count = +x.utf8Slice(5, x.length - 1).split(' ').pop() // eslint-disable-line
+    resolve(backend.query.stream
+      ? backend.query.result.count
+      : backend.query.result
     )
-    result = null
-    rows = 0
   }
 
   function CopyDone(x) {
@@ -113,7 +114,7 @@ function Backend({
 
     backend.query.stream
       ? backend.query.stream(row, rows++)
-      : result.push(row)
+      : backend.query.result.push(row)
   }
 
   function CopyData(x) {
@@ -170,7 +171,6 @@ function Backend({
   }
 
   function RowDescription(x) {
-    result = []
     rows = 0
 
     if (backend.query.statement.columns)
diff --git a/lib/connection.js b/lib/connection.js
@@ -87,6 +87,7 @@ export default function Connection(options = {}) {
   }
 
   function send(query, { sig, str, args = [] }) {
+    query.result = []
     timeout && clearTimeout(timer)
     !connection.ready || backend.query
       ? queries.push(query)
@@ -144,7 +145,7 @@ export default function Connection(options = {}) {
       if (length >= buffer.length)
         break
 
-      (backend[buffer[0]] || unknown)(buffer)
+      (backend[buffer[0]] || unknown)(buffer.slice(0, length + 1))
       buffer = buffer.slice(length + 1)
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ export default function Connection(options = {}) {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`function send(query, { sig, str, args = [] }) {`
	`90`	`+ query.result = []`
`90`	`91`	`timeout && clearTimeout(timer)`
`91`	`92`	`!connection.ready \|\| backend.query`
`92`	`93`	`? queries.push(query)`
`@@ -144,7 +145,7 @@ export default function Connection(options = {}) {`
`144`	`145`	`if (length >= buffer.length)`
`145`	`146`	`break`
`146`	`147`
`147`		`- (backend[buffer[0]] \|\| unknown)(buffer)`
	`148`	`+ (backend[buffer[0]] \|\| unknown)(buffer.slice(0, length + 1))`
`148`	`149`	`buffer = buffer.slice(length + 1)`
`149`	`150`	`}`
`150`	`151`	`}`