From c7fa55016e12b95858e4abe0c145e55d832d193e Mon Sep 17 00:00:00 2001
From: Tim Jones <me.timjones@gmail.com>
Date: Tue, 18 Jul 2017 23:59:20 -0500
Subject: [PATCH] upgrading to pg 7

---
 package.json |  2 +-
 src/db.js    |  2 +-
 yarn.lock    | 31 ++++++++++++-------------------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 27cd9e79..c553c1d7 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "bluebird": "^3.4.6",
-    "pg": "^6.1.0",
+    "pg": "^7.0.1",
     "uuid": "^3.0.0"
   },
   "devDependencies": {
diff --git a/src/db.js b/src/db.js
index 2e249140..a358ce06 100644
--- a/src/db.js
+++ b/src/db.js
@@ -45,7 +45,7 @@ class Db extends EventEmitter {
   }
 
   close(){
-    return this.pool.end();
+    return !this.pool.ending ? this.pool.end() : Promise.resolve(true);
   }
 
   executeSql(text, values) {
diff --git a/yarn.lock b/yarn.lock
index 7fa4b708..42e875f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1012,10 +1012,6 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
-generic-pool@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"
-
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -1695,7 +1691,7 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@4.1.0, object-assign@^4.1.0:
+object-assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
 
@@ -1758,9 +1754,9 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
-packet-reader@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.2.0.tgz#819df4d010b82d5ea5671f8a1a3acf039bcd7700"
+packet-reader@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27"
 
 parse-glob@^3.0.4:
   version "3.0.4"
@@ -1811,12 +1807,9 @@ pg-connection-string@0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
 
-pg-pool@1.*:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.7.1.tgz#421105cb7469979dcc48d6fc4fe3fe4659437437"
-  dependencies:
-    generic-pool "2.4.3"
-    object-assign "4.1.0"
+pg-pool@2.*:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.1.tgz#8b12541df271b57f7020c50a3f5566471f82c77e"
 
 pg-types@1.*:
   version "1.11.0"
@@ -1828,14 +1821,14 @@ pg-types@1.*:
     postgres-date "~1.0.0"
     postgres-interval "~1.0.0"
 
-pg@^6.1.0:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-6.1.5.tgz#204fa40c1252ab7220d7cf6992886b20d77862b8"
+pg@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-7.0.1.tgz#6cd31b95f58ad91af13122e4e004a43409132759"
   dependencies:
     buffer-writer "1.0.1"
-    packet-reader "0.2.0"
+    packet-reader "0.3.1"
     pg-connection-string "0.1.3"
-    pg-pool "1.*"
+    pg-pool "2.*"
     pg-types "1.*"
     pgpass "1.x"
     semver "4.3.2"