fixing an issue with db pool links.

vitaly-t · Jun 1, 2017 · c3a2e5d · c3a2e5d
1 parent 7ceb3e0
commit c3a2e5d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/lib/connect.js b/lib/connect.js
@@ -11,7 +11,7 @@ function poolConnect(ctx, config, db) {
     return config.promise((resolve, reject) => {
         var pool = db.$pool;
         if (!pool) {
-            pool = db.$pool = $npm.pools.getPool(ctx, config.pgp.pg, db);
+            pool = $npm.pools.acquirePool(ctx, config.pgp.pg, db);
         }
         pool.connect((err, client, done) => {
             if (err) {

diff --git a/lib/pools.js b/lib/pools.js
@@ -8,9 +8,9 @@ var $npm = {
 
 var pools = {}; // global list of pools
 
-function getPool(ctx, pg, db) {
+function acquirePool(ctx, pg, db) {
 
-    var cp = new $npm.ConnectionParameters(ctx.cn),
+    var p, cp = new $npm.ConnectionParameters(ctx.cn),
         ps = ctx.options.poolStrategy;
 
     if ($npm.utils.isNull(ps)) {
@@ -44,20 +44,25 @@ function getPool(ctx, pg, db) {
     }
 
     if (poolName in pools) {
-        return pools[poolName].pool;
+        p = pools[poolName];
+        db.$pool = p.pool;
+        p.dbs.push(db);
+        return p.pool;
     }
 
-    var p = new pg.Pool(ctx.cn);
+    p = new pg.Pool(ctx.cn);
     p.on('error', onError);
     pools[poolName] = {
-        pool: p, db
+        pool: p, dbs: [db]
     };
     return p;
 }
 
 function shutDown() {
     for (var p in pools) {
-        pools[p].db.$pool = null;
+        pools[p].dbs.forEach(db => {
+            db.$pool = null;
+        });
         pools[p].pool.removeListener('error', onError);
         pools[p].pool.end(); // Mr. Dead Pool :)
     }
@@ -82,7 +87,7 @@ function getAllPools() {
 }
 
 module.exports = {
-    getPool,
+    acquirePool,
     getAllPools,
     shutDown
 };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "Promises interface for PostgreSQL",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",