Better compatibility with pg

Author: brianc

index.js

@@ -41,17 +41,6 @@ Pool.prototype._create = function (cb) {
       this.log('client connection error:', err)
       cb(err)
     }
-
-    var query = client.query;
-
-    client.queryAsync = function (text, values) {
-      return new this.Promise((resolve, reject) => {
-        client.query(text, values, function (err, res) {
-          err ? reject(err) : resolve(res)
-        })
-      })
-    }.bind(this)
-
     cb(err, err ? null : client)
   }.bind(this))
 }
@@ -92,16 +81,15 @@ Pool.prototype.connect = function (cb) {
 Pool.prototype.take = Pool.prototype.connect
 
 Pool.prototype.query = function (text, values) {
-  return this.take().then(function (client) {
-    return client.queryAsync(text, values)
-      .then(function (res) {
-        client.release()
-        return res
-      }).catch(function (error) {
-        client.release(error)
-        throw error
+  return new this.Promise(function (resolve, reject) {
+    this.connect(function (err, client, done) {
+      if (err) return reject(err)
+      client.query(text, values, function (err, res) {
+        done(err)
+        err ? reject(err) : resolve(res)
       })
-  })
+    })
+  }.bind(this))
 }
 
 Pool.prototype.end = function (cb) {

package.json

@@ -31,7 +31,7 @@
     "expect.js": "0.3.1",
     "lodash": "4.13.1",
     "mocha": "^2.3.3",
-    "pg": "4.5.6",
+    "pg": "5.1.0",
     "standard": "7.1.2",
     "standard-format": "2.2.1"
   },

test/index.js

@@ -1,6 +1,5 @@
 var expect = require('expect.js')
 var co = require('co')
-var Promise = require('bluebird')
 var _ = require('lodash')
 
 var describe = require('mocha').describe
@@ -59,7 +58,7 @@ describe('pool', function () {
       var pool = new Pool()
       var client = yield pool.connect()
       expect(pool.pool.availableObjectsCount()).to.be(0)
-      var res = yield client.queryAsync('select $1::text as name', ['hi'])
+      var res = yield client.query('select $1::text as name', ['hi'])
       expect(res.rows).to.eql([{ name: 'hi' }])
       client.release()
       expect(pool.pool.getPoolSize()).to.be(1)
@@ -69,10 +68,9 @@ describe('pool', function () {
 
     it('properly pools clients', co.wrap(function * () {
       var pool = new Pool({ poolSize: 9 })
-      var count = 0
       yield _.times(30).map(function * () {
         var client = yield pool.connect()
-        var result = yield client.queryAsync('select $1::text as name', ['hi'])
+        yield client.query('select $1::text as name', ['hi'])
         client.release()
       })
       expect(pool.pool.getPoolSize()).to.be(9)