Update code to run on >=0.10.0 (#17)

* Replace const with var

* Update code to run on 0.10.x +

* Lint

.travis.yml

@@ -2,6 +2,12 @@ language: node_js
 
 matrix:
   include:
+    - node_js: "0.10"
+      addons:
+        postgresql: "9.1"
+    - node_js: "0.12"
+      addons:
+        postgresql: "9.1"
     - node_js: "4"
       addons:
         postgresql: "9.1"

index.js

@@ -89,6 +89,7 @@ Pool.prototype.query = function (text, values, cb) {
     cb = values
     values = undefined
   }
+
   return new this.Promise(function (resolve, reject) {
     this.connect(function (err, client, done) {
       if (err) return reject(err)

package.json

@@ -26,8 +26,7 @@
   },
   "homepage": "https://github.com/brianc/node-pg-pool#readme",
   "devDependencies": {
-    "bluebird": "3.4.0",
-    "co": "4.6.0",
+    "bluebird": "3.4.1",
     "expect.js": "0.3.1",
     "lodash": "4.13.1",
     "mocha": "^2.3.3",

test/index.js

@@ -1,16 +1,20 @@
 var expect = require('expect.js')
-var co = require('co')
 var _ = require('lodash')
 
 var describe = require('mocha').describe
 var it = require('mocha').it
+var Promise = require('bluebird')
 
 var Pool = require('../')
 
+if (typeof global.Promise === 'undefined') {
+  global.Promise = Promise
+}
+
 describe('pool', function () {
   describe('with callbacks', function () {
     it('works totally unconfigured', function (done) {
-      const pool = new Pool()
+      var pool = new Pool()
       pool.connect(function (err, client, release) {
         if (err) return done(err)
         client.query('SELECT NOW()', function (err, res) {
@@ -23,7 +27,7 @@ describe('pool', function () {
     })
 
     it('passes props to clients', function (done) {
-      const pool = new Pool({ binary: true })
+      var pool = new Pool({ binary: true })
       pool.connect(function (err, client, release) {
         release()
         if (err) return done(err)
@@ -33,7 +37,7 @@ describe('pool', function () {
     })
 
     it('can run a query with a callback without parameters', function (done) {
-      const pool = new Pool()
+      var pool = new Pool()
       pool.query('SELECT 1 as num', function (err, res) {
         expect(res.rows[0]).to.eql({ num: 1 })
         pool.end(function () {
@@ -43,7 +47,7 @@ describe('pool', function () {
     })
 
     it('can run a query with a callback', function (done) {
-      const pool = new Pool()
+      var pool = new Pool()
       pool.query('SELECT $1::text as name', ['brianc'], function (err, res) {
         expect(res.rows[0]).to.eql({ name: 'brianc' })
         pool.end(function () {
@@ -53,7 +57,7 @@ describe('pool', function () {
     })
 
     it('removes client if it errors in background', function (done) {
-      const pool = new Pool()
+      var pool = new Pool()
       pool.connect(function (err, client, release) {
         release()
         if (err) return done(err)
@@ -85,63 +89,71 @@ describe('pool', function () {
   })
 
   describe('with promises', function () {
-    it('connects and disconnects', co.wrap(function * () {
+    it('connects and disconnects', function () {
       var pool = new Pool()
-      var client = yield pool.connect()
-      expect(pool.pool.availableObjectsCount()).to.be(0)
-      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)
-      expect(pool.pool.availableObjectsCount()).to.be(1)
-      return yield pool.end()
-    }))
-
-    it('properly pools clients', co.wrap(function * () {
-      var pool = new Pool({ poolSize: 9 })
-      yield _.times(30).map(function * () {
-        var client = yield pool.connect()
-        yield client.query('select $1::text as name', ['hi'])
-        client.release()
+      return pool.connect().then(function (client) {
+        expect(pool.pool.availableObjectsCount()).to.be(0)
+        return client.query('select $1::text as name', ['hi']).then(function (res) {
+          expect(res.rows).to.eql([{ name: 'hi' }])
+          client.release()
+          expect(pool.pool.getPoolSize()).to.be(1)
+          expect(pool.pool.availableObjectsCount()).to.be(1)
+          return pool.end()
+        })
       })
-      expect(pool.pool.getPoolSize()).to.be(9)
-      return yield pool.end()
-    }))
+    })
 
-    it('supports just running queries', co.wrap(function * () {
+    it('properly pools clients', function () {
       var pool = new Pool({ poolSize: 9 })
-      var queries = _.times(30).map(function () {
+      return Promise.map(_.times(30), function () {
+        return pool.connect().then(function (client) {
+          return client.query('select $1::text as name', ['hi']).then(function (res) {
+            client.release()
+            return res
+          })
+        })
+      }).then(function (res) {
+        expect(res).to.have.length(30)
+        expect(pool.pool.getPoolSize()).to.be(9)
+        return pool.end()
+      })
+    })
+
+    it('supports just running queries', function () {
+      var pool = new Pool({ poolSize: 9 })
+      return Promise.map(_.times(30), function () {
         return pool.query('SELECT $1::text as name', ['hi'])
+      }).then(function (queries) {
+        expect(queries).to.have.length(30)
+        expect(pool.pool.getPoolSize()).to.be(9)
+        expect(pool.pool.availableObjectsCount()).to.be(9)
+        return pool.end()
       })
-      yield queries
-      expect(pool.pool.getPoolSize()).to.be(9)
-      expect(pool.pool.availableObjectsCount()).to.be(9)
-      return yield pool.end()
-    }))
+    })
 
-    it('recovers from all errors', co.wrap(function * () {
-      var pool = new Pool({
-        poolSize: 9,
-        log: function (str, level) {
-          // Custom logging function to ensure we are not causing errors or warnings
-          // inside the `generic-pool` library.
-          if (level === 'error' || level === 'warn') {
-            expect().fail('An error or warning was logged from the generic pool library.\n' +
-                          'Level: ' + level + '\n' +
-                          'Message: ' + str + '\n')
-          }
-        }
+    it('recovers from all errors', function () {
+      var pool = new Pool()
+
+      var errors = []
+      return Promise.mapSeries(_.times(30), function () {
+        return pool.query('SELECT asldkfjasldkf')
+          .catch(function (e) {
+            errors.push(e)
+          })
+      }).then(function () {
+        return pool.query('SELECT $1::text as name', ['hi']).then(function (res) {
+          expect(errors).to.have.length(30)
+          expect(res.rows).to.eql([{ name: 'hi' }])
+          return pool.end()
+        })
       })
-      var count = 0
-
-      while (count++ < 30) {
-        try {
-          yield pool.query('SELECT lksjdfd')
-        } catch (e) {}
-      }
-      var res = yield pool.query('SELECT $1::text as name', ['hi'])
-      expect(res.rows).to.eql([{ name: 'hi' }])
-      return yield pool.end()
-    }))
+    })
+  })
+})
+
+process.on('unhandledRejection', function (e) {
+  console.error(e.message, e.stack)
+  setImmediate(function () {
+    throw e
   })
 })

test/logging.js

@@ -1,5 +1,4 @@
 var expect = require('expect.js')
-var co = require('co')
 
 var describe = require('mocha').describe
 var it = require('mocha').it
@@ -7,14 +6,15 @@ var it = require('mocha').it
 var Pool = require('../')
 
 describe('logging', function () {
-  it('logs to supplied log function if given', co.wrap(function * () {
+  it('logs to supplied log function if given', function () {
     var messages = []
     var log = function (msg) {
       messages.push(msg)
     }
     var pool = new Pool({ log: log })
-    yield pool.query('SELECT NOW()')
-    expect(messages.length).to.be.greaterThan(0)
-    return pool.end()
-  }))
+    return pool.query('SELECT NOW()').then(function () {
+      expect(messages.length).to.be.greaterThan(0)
+      return pool.end()
+    })
+  })
 })