Initial work on removing internal pool

Author: brianc

Makefile

@@ -60,6 +60,9 @@ test-binary: test-connection-binary
 	@echo "***Testing Pure Javascript (binary)***"
 	@find test/integration -name "*-tests.js" | $(node-command) binary
 
+test-pool:
+	@find test/integration/connection-pool -name "*.js" | $(node-command) binary
+
 prepare-test-db:
 	@echo "***Preparing the database for tests***"
 	@find script/create-test-tables.js  | $(node-command)

README.md

@@ -19,13 +19,21 @@ $ npm install pg
 Generally you will access the PostgreSQL server through a pool of clients.  A client takes a non-trivial amount of time to establish a new connection. A client also consumes a non-trivial amount of resources on the PostgreSQL server - not something you want to do on every http request. Good news: node-postgres ships with built in client pooling.
 
 ```javascript
-var pg = require('pg');
-var conString = "postgres://username:password@localhost/database";
+var Pool = require('pg').Pool;
+
+var config = {
+  user: 'foo', //env var: PGUSER
+  database: 'my_db', //env var: PGDATABASE
+  password: 'secret', //env var: PGPASSWORD
+  port: 5432 //env var: PGPORT
+};
+
+var pool = new Pool(config);
 
 //this initializes a connection pool
 //it will keep idle connections open for a (configurable) 30 seconds
 //and set a limit of 10 (also configurable)
-pg.connect(conString, function(err, client, done) {
+pool.connect(function(err, client, done) {
   if(err) {
     return console.error('error fetching client from pool', err);
   }
@@ -42,6 +50,8 @@ pg.connect(conString, function(err, client, done) {
 });
 ```
 
+node-postgres uses [pg-pool](https://github.com/brianc/node-pg-pool.git) to manage pooling and only provides a very thin layer on top.  It's highly recommend you read the documentation for [pg-pool](https://github.com/brianc/node-pg-pool.git)
+
 [Check this out for the get up and running quickly example](https://github.com/brianc/node-postgres/wiki/Example)
 
 ### Client instance
@@ -85,7 +95,7 @@ node-postgres contains a pure JavaScript protocol implementation which is quite
 
 To use the native bindings, first install [pg-native](https://github.com/brianc/node-pg-native.git).  Once pg-native is installed, simply replace `require('pg')` with `require('pg').native`.
 
-node-postgres abstracts over the pg-native module to provide exactly the same interface as the pure JavaScript version. __No other code changes are required__.  If you find yourself having to change code other than the require statement when switching from `require('pg')` to `require('pg').native` please report an issue.
+node-postgres abstracts over the pg-native module to provide exactly the same interface as the pure JavaScript version. Care has been taken to keep the number of api differences between the two modules to a minimum; however, it is recommend you use either the pure JavaScript or native bindings in both development and production and don't mix & match them in the same process - it can get confusing!
 
 ## Features
 

lib/index.js

@@ -2,15 +2,17 @@ var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 var Client = require('./client');
 var defaults =  require('./defaults');
-var pool = require('./pool');
 var Connection = require('./connection');
+var ConnectionParameters = require('./connection-parameters');
+var Pool = require('pg-pool');
 
 var PG = function(clientConstructor) {
   EventEmitter.call(this);
   this.defaults = defaults;
   this.Client = clientConstructor;
   this.Query = this.Client.Query;
-  this.pools = pool(clientConstructor);
+  this.Pool = Pool;
+  this.pools = [];
   this.Connection = Connection;
   this.types = require('pg-types');
 };
@@ -19,16 +21,16 @@ util.inherits(PG, EventEmitter);
 
 PG.prototype.end = function() {
   var self = this;
-  var keys = Object.keys(self.pools.all);
+  var keys = Object.keys(this.pools);
   var count = keys.length;
   if(count === 0) {
     self.emit('end');
   } else {
     keys.forEach(function(key) {
-      var pool = self.pools.all[key];
-      delete self.pools.all[key];
-      pool.drain(function() {
-        pool.destroyAllNow(function() {
+      var pool = self.pools[key];
+      delete self.pools[key];
+      pool.pool.drain(function() {
+        pool.pool.destroyAllNow(function() {
           count--;
           if(count === 0) {
             self.emit('end');
@@ -39,17 +41,24 @@ PG.prototype.end = function() {
   }
 };
 
-
 PG.prototype.connect = function(config, callback) {
   if(typeof config == "function") {
     callback = config;
     config = null;
   }
-  var pool = this.pools.getOrCreate(config);
+  var poolName = config || '__DEFAULT';
+  if (typeof config == 'string') {
+    config = new ConnectionParameters(config);
+  }
+
+  this.pools[poolName] = this.pools[poolName] || new Pool(config, this.Client);
+  var pool = this.pools[poolName];
   pool.connect(callback);
   if(!pool.listeners('error').length) {
     //propagate errors up to pg object
-    pool.on('error', this.emit.bind(this, 'error'));
+    pool.on('error', function(e) {
+      this.emit('error', e, e.client);
+    }.bind(this));
   }
 };
 

lib/pool.js

@@ -19,16 +19,17 @@
   "main": "./lib",
   "dependencies": {
     "buffer-writer": "1.0.1",
-    "generic-pool": "2.4.2",
     "packet-reader": "0.2.0",
     "pg-connection-string": "0.1.3",
+    "pg-pool": "1.*",
     "pg-types": "1.*",
     "pgpass": "0.0.6",
     "semver": "4.3.2"
   },
   "devDependencies": {
     "async": "0.9.0",
     "jshint": "2.5.2",
+    "lodash": "4.13.1",
     "pg-copy-streams": "0.3.0"
   },
   "minNativeVersion": "1.7.0",

package.json

@@ -1,12 +1,13 @@
 var helper = require(__dirname + '/test-helper');
+var _ = require('lodash')
 
-helper.pg.defaults.poolIdleTimeout = 200;
+const config = _.extend({ }, helper.config, { idleTimeoutMillis: 50 })
 
 test('idle timeout', function() {
- helper.pg.connect(helper.config, assert.calls(function(err, client, done) {
+ helper.pg.connect(config, assert.calls(function(err, client, done) {
    assert.isNull(err);
    client.query('SELECT NOW()');
-  //just let this one time out 
+  //just let this one time out
   //test will hang if pool doesn't timeout
    done();
  }));

test/integration/client/query-callback-error-tests.js

@@ -15,7 +15,6 @@ helper.pg.connect(assert.calls(function(err, client, done) {
     setTimeout(function() {
       helper.pg.end();
       done();
-      
     }, 10);
   });
 }));

test/integration/connection-pool/idle-timeout-tests.js

@@ -4,6 +4,7 @@ var async = require('async')
 var testWithoutDomain = function(cb) {
   test('no domain', function() {
     assert(!process.domain)
+    console.log(helper.pg.Client)
     helper.pg.connect(helper.config, assert.success(function(client, done) {
       assert(!process.domain)
       done()