From c5640c93606216605ecfd9d27bf68da4ac3533b2 Mon Sep 17 00:00:00 2001
From: "Brian M. Carlson" <brian.m.carlson@gmail.com>
Date: Fri, 10 Jan 2020 09:57:21 -0600
Subject: [PATCH] Make `BoundPool` an es6 subclass of `Pool`

This fixes subtle subclassing bugs using es6 classes.  It is a semver breaking change targeting 8.0 release...though it's not likely to cause issues in the general case.
---
 packages/pg/lib/index.js                      | 45 +++++++++----------
 .../test/integration/gh-issues/1542-tests.js  | 25 +++++++++++
 2 files changed, 45 insertions(+), 25 deletions(-)
 create mode 100644 packages/pg/test/integration/gh-issues/1542-tests.js

diff --git a/packages/pg/lib/index.js b/packages/pg/lib/index.js
index de33c086d..f08fc851c 100644
--- a/packages/pg/lib/index.js
+++ b/packages/pg/lib/index.js
@@ -7,35 +7,30 @@
  * README.md file in the root directory of this source tree.
  */
 
-var util = require('util')
-var Client = require('./client')
-var defaults = require('./defaults')
-var Connection = require('./connection')
-var Pool = require('pg-pool')
-const checkConstructor = require('./compat/check-constructor')
+const Client = require('./client')
+const defaults = require('./defaults')
+const Connection = require('./connection')
+const Pool = require('pg-pool')
 
 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)
+  return class BoundPool extends Pool {
+    constructor(options) {
+      const config = Object.assign({ Client: Client }, options)
+      super(config)
+    }
   }
-
-  util.inherits(BoundPool, Pool)
-
-  return BoundPool
 }
 
-var PG = function (clientConstructor) {
-  this.defaults = defaults
-  this.Client = clientConstructor
-  this.Query = this.Client.Query
-  this.Pool = poolFactory(this.Client)
-  this._pools = []
-  this.Connection = Connection
-  this.types = require('pg-types')
+class PG {
+  constructor(clientConstructor) {
+    this.defaults = defaults
+    this.Client = clientConstructor
+    this.Query = this.Client.Query
+    this.Pool = poolFactory(this.Client)
+    this._pools = []
+    this.Connection = Connection
+    this.types = require('pg-types')
+  }
 }
 
 if (typeof process.env.NODE_PG_FORCE_NATIVE !== 'undefined') {
@@ -46,7 +41,7 @@ if (typeof process.env.NODE_PG_FORCE_NATIVE !== 'undefined') {
   // lazy require native module...the native module may not have installed
   module.exports.__defineGetter__('native', function () {
     delete module.exports.native
-    var native = null
+    let native = null
     try {
       native = new PG(require('./native'))
     } catch (err) {
diff --git a/packages/pg/test/integration/gh-issues/1542-tests.js b/packages/pg/test/integration/gh-issues/1542-tests.js
new file mode 100644
index 000000000..4d30d6020
--- /dev/null
+++ b/packages/pg/test/integration/gh-issues/1542-tests.js
@@ -0,0 +1,25 @@
+
+"use strict"
+const helper = require('./../test-helper')
+const assert = require('assert')
+
+const suite = new helper.Suite()
+
+suite.testAsync('BoundPool can be subclassed', async () => {
+  const Pool = helper.pg.Pool;
+  class SubPool extends Pool {
+
+  }
+  const subPool = new SubPool()
+  const client = await subPool.connect()
+  client.release()
+  await subPool.end()
+  assert(subPool instanceof helper.pg.Pool)
+})
+
+suite.test('calling pg.Pool without new throws', () => {
+  const Pool = helper.pg.Pool;
+  assert.throws(() => {
+    const pool = Pool()
+  })
+})