Added test and fixed error returning

Author: edevil

lib/client.js

@@ -399,19 +399,20 @@ Client.prototype.query = function (config, values, callback) {
   // can take in strings, config object or query object
   var query
   var result
+  var readTimeout
+  var readTimeoutTimer
+  var queryCallback
 
   if (config === null || config === undefined) {
     throw new TypeError('Client was passed a null or undefined query')
   } else if (typeof config.submit === 'function') {
-    var readTimeoutTimer
-    var queryCallback
-    var readTimeout = config.query_timeout || this.connectionParameters.query_timeout
-
+    readTimeout = config.query_timeout || this.connectionParameters.query_timeout
     result = query = config
     if (typeof values === 'function') {
       query.callback = query.callback || values
     }
   } else {
+    readTimeout = this.connectionParameters.query_timeout
     query = new Query(config, values, callback)
     if (!query.callback) {
       result = new this._Promise((resolve, reject) => {
@@ -426,7 +427,9 @@ Client.prototype.query = function (config, values, callback) {
     readTimeoutTimer = setTimeout(() => {
       var error = new Error('Query read timeout')
 
-      this.emit('error', error)
+      process.nextTick(() => {
+        query.handleError(error, this.connection)
+      })
 
       if (typeof queryCallback === 'function') {
         queryCallback(error)

test/integration/client/api-tests.js

@@ -15,6 +15,17 @@ suite.test('pool callback behavior', done => {
   })
 })
 
+suite.test('query timeout', (cb) => {
+  const pool = new pg.Pool({query_timeout: 1000})
+  pool.connect().then((client) => {
+    client.query('SELECT pg_sleep(2)', assert.calls(function (err, result) {
+      assert(err)
+      client.release()
+      pool.end(cb)
+    }))
+  })
+})
+
 suite.test('callback API', done => {
   const client = new helper.Client()
   client.query('CREATE TEMP TABLE peep(name text)')