Skip to content

Commit

Permalink
upgrading to pg 7
Browse files Browse the repository at this point in the history
  • Loading branch information
timgit committed Jul 19, 2017
1 parent 22a7e66 commit c7fa550
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 21 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"bluebird": "^3.4.6",
"pg": "^6.1.0",
"pg": "^7.0.1",
"uuid": "^3.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/db.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
31 changes: 12 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit c7fa550

Please sign in to comment.