Merge origin/master

Author: brianc

packages/pg/lib/client.js

@@ -251,6 +251,7 @@ Client.prototype._connect = function (callback) {
       ? new Error('Connection terminated')
       : new Error('Connection terminated unexpectedly')
 
+    clearTimeout(connectionTimeoutHandle)
     this._errorAllQueries(error)
 
     if (!this._ending) {

packages/pg/lib/compat/check-constructor.js

@@ -0,0 +1,22 @@
+'use strict'
+
+const warnDeprecation = require('./warn-deprecation')
+
+// Node 4 doesn’t support new.target.
+let hasNewTarget
+
+try {
+  // eslint-disable-next-line no-eval
+  eval('(function () { new.target })')
+  hasNewTarget = true
+} catch (error) {
+  hasNewTarget = false
+}
+
+const checkConstructor = (name, code, getNewTarget) => {
+  if (hasNewTarget && getNewTarget() === undefined) {
+    warnDeprecation(`Constructing a ${name} without new is deprecated and will stop working in pg 8.`, code)
+  }
+}
+
+module.exports = checkConstructor

packages/pg/lib/compat/warn-deprecation.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const util = require('util')
+
+const dummyFunctions = new Map()
+
+// Node 4 doesn’t support process.emitWarning(message, 'DeprecationWarning', code).
+const emitDeprecationWarning = (message, code) => {
+  let dummy = dummyFunctions.get(code)
+
+  if (dummy === undefined) {
+    dummy = util.deprecate(() => {}, message)
+    dummyFunctions.set(code, dummy)
+  }
+
+  dummy()
+}
+
+module.exports = emitDeprecationWarning

packages/pg/lib/connection.js

@@ -594,27 +594,19 @@ Connection.prototype._readValue = function (buffer) {
 // parses error
 Connection.prototype.parseE = function (buffer, length) {
   var fields = {}
-  var msg, item
-  var input = new Message('error', length)
   var fieldType = this.readString(buffer, 1)
   while (fieldType !== '\0') {
     fields[fieldType] = this.parseCString(buffer)
     fieldType = this.readString(buffer, 1)
   }
-  if (input.name === 'error') {
-    // the msg is an Error instance
-    msg = new Error(fields.M)
-    for (item in input) {
-      // copy input properties to the error
-      if (Object.prototype.hasOwnProperty.call(input, item)) {
-        msg[item] = input[item]
-      }
-    }
-  } else {
-    // the msg is an object literal
-    msg = input
-    msg.message = fields.M
-  }
+
+  // the msg is an Error instance
+  var msg = new Error(fields.M)
+
+  // for compatibility with Message
+  msg.name = 'error'
+  msg.length = length
+
   msg.severity = fields.S
   msg.code = fields.C
   msg.detail = fields.D

packages/pg/lib/index.js

@@ -12,9 +12,13 @@ var Client = require('./client')
 var defaults = require('./defaults')
 var Connection = require('./connection')
 var Pool = require('pg-pool')
+const checkConstructor = require('./compat/check-constructor')
 
 const poolFactory = (Client) => {
   var BoundPool = function (options) {
+    // eslint-disable-next-line no-eval
+    checkConstructor('pg.Pool', 'PG-POOL-NEW', () => eval('new.target'))
+
     var config = Object.assign({ Client: Client }, options)
     return new Pool(config)
   }

packages/pg/lib/query.js

@@ -9,12 +9,15 @@
 
 var EventEmitter = require('events').EventEmitter
 var util = require('util')
+const checkConstructor = require('./compat/check-constructor')
 
 var Result = require('./result')
 var utils = require('./utils')
 
 var Query = function (config, values, callback) {
-  // use of "new" optional
+  // use of "new" optional in pg 7
+  // eslint-disable-next-line no-eval
+  checkConstructor('Query', 'PG-QUERY-NEW', () => eval('new.target'))
   if (!(this instanceof Query)) { return new Query(config, values, callback) }
 
   config = utils.normalizeQueryConfig(config, values, callback)