fixed cursor related bugs:

davojan · davojan · commit 2c0947a0a9f5 · 2021-02-02T23:20:43.000+03:00
1) last chunk won't emit when not aligned
2) err.query defined second time causing unwanted crash in some scenarios
diff --git a/lib/backend.js b/lib/backend.js
@@ -88,7 +88,7 @@ function Backend({
       }
     }
 
-    oncomplete()
+    oncomplete(backend.query.result)
   }
 
   /* c8 ignore next 3 */
diff --git a/lib/connection.js b/lib/connection.js
@@ -73,8 +73,22 @@ function Connection(options = {}) {
     })
   }
 
-  function oncomplete() {
-    backend.query.cursor && socket.write(frontend.Close())
+  function oncomplete(result) {
+    if (backend.query.cursor) {
+      if (result.length) {
+        // emit final chunk to cursor handler
+        new Promise(r => r(backend.query.cursor(
+          backend.query.cursor.rows === 1 ? result[0] : result
+        ))).then(() => {
+          socket.write(frontend.Close())
+        }).catch(err => {
+          rejectQuery(backend.query, err)
+          socket.write(frontend.Close())
+        })
+      } else {
+        socket.write(frontend.Close())
+      }
+    }
   }
 
   function onparse() {
@@ -207,14 +221,18 @@ function Connection(options = {}) {
     if (query.origin) {
       err.stack += query.origin.replace(/.*\n/, '\n')
     }
-    Object.defineProperty(err, 'query', {
-      value: query.str,
-      enumerable: !!options.debug
-    })
-    Object.defineProperty(err, 'parameters', {
-      value: query.args,
-      enumerable: !!options.debug
-    })
+    if (!err.query) {
+      Object.defineProperty(err, 'query', {
+        value: query.str,
+        enumerable: !!options.debug
+      })
+    }
+    if (!err.parameters) {
+      Object.defineProperty(err, 'parameters', {
+        value: query.args,
+        enumerable: !!options.debug
+      })
+    }
     query.reject(err)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ function Backend({`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`91`		`- oncomplete()`
	`91`	`+ oncomplete(backend.query.result)`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/* c8 ignore next 3 */`