lib/client.js

@@ -400,7 +400,7 @@ Client.prototype.end = function (cb) {
     // if we have an active query we need to force a disconnect
     // on the socket - otherwise a hung query could block end forever
     this.connection.stream.destroy(new Error('Connection terminated by user'))
-    return
+    return cb ? cb() : Promise.resolve()
   }
   if (cb) {
     this.connection.end()

lib/native/query.js

@@ -50,21 +50,20 @@ var errorFieldMap = {
 }
 
 NativeQuery.prototype.handleError = function (err) {
-  var self = this
   // copy pq error fields into the error object
-  var fields = self.native.pq.resultErrorFields()
+  var fields = this.native.pq.resultErrorFields()
   if (fields) {
     for (var key in fields) {
       var normalizedFieldName = errorFieldMap[key] || key
       err[normalizedFieldName] = fields[key]
     }
   }
-  if (self.callback) {
-    self.callback(err)
+  if (this.callback) {
+    this.callback(err)
   } else {
-    self.emit('error', err)
+    this.emit('error', err)
   }
-  self.state = 'error'
+  this.state = 'error'
 }
 
 NativeQuery.prototype.then = function (onSuccess, onFailure) {

lib/utils.js

@@ -70,7 +70,7 @@ var prepareValue = function (val, seen) {
 }
 
 function prepareObject (val, seen) {
-  if (val.toPostgres && typeof val.toPostgres === 'function') {
+  if (val && typeof val.toPostgres === 'function') {
     seen = seen || []
     if (seen.indexOf(val) !== -1) {
       throw new Error('circular reference detected while preparing "' + val + '" for query')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",

test/integration/gh-issues/1382-tests.js

@@ -0,0 +1,34 @@
+"use strict"
+var helper = require('./../test-helper')
+
+const suite = new helper.Suite()
+
+suite.test('calling end during active query should return a promise', (done) => {
+  const client = new helper.pg.Client()
+  let callCount = 0
+  // ensure both the query rejects and the end promise resolves
+  const after = () => {
+    if (++callCount > 1) {
+      done()
+    }
+  }
+  client.connect().then(() => {
+    client.query('SELECT NOW()').catch(after)
+    client.end().then(after)
+  })
+})
+
+suite.test('calling end during an active query should call end callback', (done) => {
+  const client = new helper.pg.Client()
+  let callCount = 0
+  // ensure both the query rejects and the end callback fires
+  const after = () => {
+    if (++callCount > 1) {
+      done()
+    }
+  }
+  client.connect().then(() => {
+    client.query('SELECT NOW()').catch(after)
+    client.end(after)
+  })
+})