Connect hook working

Author: brianc

packages/pg-pool/index.js

@@ -278,7 +278,19 @@ class Pool extends EventEmitter {
         this.log('new client connected')
 
         if (this.options.hooks && this.options.hooks.connect) {
-          const hookResult = this.options.hooks.connect(client)
+          let hookResult
+          try {
+            hookResult = this.options.hooks.connect(client)
+          } catch (hookErr) {
+            this._clients = this._clients.filter((c) => c !== client)
+            client.end(() => {
+              this._pulseQueue()
+              if (!pendingItem.timedOut) {
+                pendingItem.callback(hookErr, undefined, NOOP)
+              }
+            })
+            return
+          }
           if (hookResult && typeof hookResult.then === 'function') {
             hookResult.then(
               () => {

packages/pg-pool/test/lifecycle-hooks.js

@@ -22,4 +22,59 @@ describe('lifecycle hooks', () => {
     client.release()
     await pool.end()
   })
+
+  it('are called on connect with an async hook', async () => {
+    const pool = new Pool({
+      hooks: {
+        connect: async (client) => {
+          const res = await client.query('SELECT 1 AS num')
+          client.HOOK_CONNECT_RESULT = res.rows[0].num
+        },
+      },
+    })
+    const client = await pool.connect()
+    expect(client.HOOK_CONNECT_RESULT).to.equal(1)
+    const res = await client.query('SELECT 1 AS num')
+    expect(res.rows[0].num).to.equal(1)
+    client.release()
+    const client2 = await pool.connect()
+    expect(client).to.equal(client2)
+    expect(client2.HOOK_CONNECT_RESULT).to.equal(1)
+    client.release()
+    await pool.end()
+  })
+
+  it('errors out the connect call if the async connect hook rejects', async () => {
+    const pool = new Pool({
+      hooks: {
+        connect: async (client) => {
+          await client.query('SELECT INVALID HERE')
+        },
+      },
+    })
+    try {
+      await pool.connect()
+      throw new Error('Expected connect to throw')
+    } catch (err) {
+      expect(err.message).to.contain('invalid')
+    }
+    await pool.end()
+  })
+
+  it('errors out the connect call if the connect hook throws', async () => {
+    const pool = new Pool({
+      hooks: {
+        connect: () => {
+          throw new Error('connect hook error')
+        },
+      },
+    })
+    try {
+      await pool.connect()
+      throw new Error('Expected connect to throw')
+    } catch (err) {
+      expect(err.message).to.equal('connect hook error')
+    }
+    await pool.end()
+  })
 })