Fix some errors not throwing for current query

porsager · porsager · commit 87b09432149f · 2020-03-10T12:04:37.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -97,13 +97,12 @@ function Connection(options = {}) {
   }
 
   function destroy() {
-    const err = errors.connection('DESTROYED', options)
-    backend.query && backend.query.reject(err)
-    error(err)
+    error(errors.connection('DESTROYED', options))
     socket.destroy()
   }
 
   function error(err) {
+    backend.query && backend.query.reject(err)
     let q
     while ((q = queries.shift()))
       q.reject(err)
diff --git a/lib/frontend.js b/lib/frontend.js
@@ -3,6 +3,7 @@ const bytes = require('./bytes.js')
 const { errors, entries } = require('./types.js')
 
 const N = String.fromCharCode(0)
+const empty = Buffer.alloc(0)
 const execute = Buffer.concat([
   bytes.D().str('P').str(N).end(),
   bytes.E().str(N).i32(0).end(),
@@ -126,7 +127,7 @@ function SASLContinue(type, x, options, pass) {
 
 function SASLFinal(type, x, options) {
   if (x.toString('utf8', 9).split(N, 1)[0].slice(2) === options.serverSignature)
-    return ''
+    return empty
   /* c8 ignore next 4 */
   throw errors.generic({
     message: 'The server did not return the correct signature',

Original file line number	Diff line number	Diff line change
`@@ -97,13 +97,12 @@ function Connection(options = {}) {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`function destroy() {`
`100`		`- const err = errors.connection('DESTROYED', options)`
`101`		`- backend.query && backend.query.reject(err)`
`102`		`- error(err)`
	`100`	`+ error(errors.connection('DESTROYED', options))`
`103`	`101`	`socket.destroy()`
`104`	`102`	`}`
`105`	`103`
`106`	`104`	`function error(err) {`
	`105`	`+ backend.query && backend.query.reject(err)`
`107`	`106`	`let q`
`108`	`107`	`while ((q = queries.shift()))`
`109`	`108`	`q.reject(err)`