From 3daece59db369879de24d83a6fd53974dcd868c0 Mon Sep 17 00:00:00 2001
From: Vincent Wilson <vince@classyh.at>
Date: Sat, 10 Oct 2020 20:01:46 -0400
Subject: [PATCH 1/2] Add 'connection' to postgres user callback

---
 dist/lib/integrations/pg.js | 4 ++--
 lib/integrations/pg.ts      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dist/lib/integrations/pg.js b/dist/lib/integrations/pg.js
index 711310e4..4d354739 100644
--- a/dist/lib/integrations/pg.js
+++ b/dist/lib/integrations/pg.js
@@ -30,10 +30,10 @@ class PGIntegration extends integrations_1.RequireIntegration {
             // If a callback was specified we need to do callback version
             if (userCallback) {
                 return originalConnectFn.apply(this, [
-                    err => {
+                    (err, connection) => {
                         if (err) {
                             integration.logFn("[scout/integrations/pg] Connection to Postgres db failed", types_1.LogLevel.Trace);
-                            userCallback(err);
+                            userCallback(err, connection);
                             return;
                         }
                         userCallback();
diff --git a/lib/integrations/pg.ts b/lib/integrations/pg.ts
index b4003478..fbc4f25b 100644
--- a/lib/integrations/pg.ts
+++ b/lib/integrations/pg.ts
@@ -35,19 +35,19 @@ export class PGIntegration extends RequireIntegration {
         const originalConnectFn = Client.prototype.connect;
         const integration = this;
 
-        const fn: any = function(this: Client, userCallback?: (err?: Error) => void) {
+        const fn: any = function(this: Client, userCallback?: (err?: Error, connection?: any) => void) {
             integration.logFn("[scout/integrations/pg] Connecting to Postgres db...", LogLevel.Trace);
 
             // If a callback was specified we need to do callback version
             if (userCallback) {
                 return originalConnectFn.apply(this, [
-                    err => {
+                    (err, connection) => {
                         if (err) {
                             integration.logFn(
                                 "[scout/integrations/pg] Connection to Postgres db failed",
                                 LogLevel.Trace,
                             );
-                            userCallback(err);
+                            userCallback(err, connection);
                             return;
                         }
                         userCallback();

From fedc41d860455b21d654cbd3589ea6affcb085e7 Mon Sep 17 00:00:00 2001
From: Vincent Wilson <vince@classyh.at>
Date: Sat, 10 Oct 2020 21:23:05 -0400
Subject: [PATCH 2/2] Ensure we send the connection w/ an invalid callback as
 well

---
 dist/lib/integrations/pg.js | 2 +-
 lib/integrations/pg.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/lib/integrations/pg.js b/dist/lib/integrations/pg.js
index 4d354739..d697e618 100644
--- a/dist/lib/integrations/pg.js
+++ b/dist/lib/integrations/pg.js
@@ -36,7 +36,7 @@ class PGIntegration extends integrations_1.RequireIntegration {
                             userCallback(err, connection);
                             return;
                         }
-                        userCallback();
+                        userCallback(undefined, connection);
                     },
                 ]);
             }
diff --git a/lib/integrations/pg.ts b/lib/integrations/pg.ts
index fbc4f25b..8516a7a7 100644
--- a/lib/integrations/pg.ts
+++ b/lib/integrations/pg.ts
@@ -50,7 +50,7 @@ export class PGIntegration extends RequireIntegration {
                             userCallback(err, connection);
                             return;
                         }
-                        userCallback();
+                        userCallback(undefined, connection);
                     },
                 ]);
             }