Merge pull request brianc#28 from brianc/rickbergfalk-master

brianc · web-flow · commit 25d978e59357 · 2017-08-05T15:55:54.000-05:00
Do not send close after readyForQuery
diff --git a/index.js b/index.js
@@ -145,6 +145,9 @@ Cursor.prototype.end = function(cb) {
 }
 
 Cursor.prototype.close = function(cb) {
+  if (this.state == 'done') {
+    return setImmediate(cb)
+  }
   this.connection.close({type: 'P'})
   this.connection.sync()
   this.state = 'done'
diff --git a/test/pool.js b/test/pool.js
@@ -0,0 +1,85 @@
+const assert = require('assert')
+const Cursor = require('../')
+const pg = require('pg')
+
+const text = 'SELECT generate_series as num FROM generate_series(0, 50)'
+
+function poolQueryPromise(pool, readRowCount) {
+  return new Promise((resolve, reject) => {
+    pool.connect((err, client, done) => {
+      if (err) {
+        done(err)
+        return reject(err)
+      }
+      const cursor = client.query(new Cursor(text))
+      cursor.read(readRowCount, (err, res) => {
+        if (err) {
+          done(err)
+          return reject(err)
+        }
+        cursor.close(err => {
+          if (err) {
+            done(err)
+            return reject(err)
+          }
+          done()
+          resolve()
+        })
+      })
+    })
+  })
+}
+
+describe('pool', function() {
+  beforeEach(function() {
+    this.pool = new pg.Pool({max: 1})
+  })
+
+  afterEach(function() {
+    this.pool.end()
+  })
+
+  it('closes cursor early, single pool query', function(done) {
+    poolQueryPromise(this.pool, 25)
+      .then(() => done())
+      .catch(err => {
+        assert.ifError(err)
+        done()
+      })
+  })
+
+  it('closes cursor early, saturated pool', function(done) {
+    const promises = []
+    for (let i = 0; i < 10; i++) {
+      promises.push(poolQueryPromise(this.pool, 25))
+    }
+    Promise.all(promises)
+      .then(() => done())
+      .catch(err => {
+        assert.ifError(err)
+        done()
+      })
+  })
+
+  it('closes exhausted cursor, single pool query', function(done) {
+    poolQueryPromise(this.pool, 100)
+      .then(() => done())
+      .catch(err => {
+        assert.ifError(err)
+        done()
+      })
+  })
+
+  it('closes exhausted cursor, saturated pool', function(done) {
+    const promises = []
+    for (let i = 0; i < 10; i++) {
+      promises.push(poolQueryPromise(this.pool, 100))
+    }
+    Promise.all(promises)
+      .then(() => done())
+      .catch(err => {
+        assert.ifError(err)
+        done()
+      })
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,9 @@ Cursor.prototype.end = function(cb) {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`Cursor.prototype.close = function(cb) {`
	`148`	`+ if (this.state == 'done') {`
	`149`	`+ return setImmediate(cb)`
	`150`	`+ }`
`148`	`151`	`this.connection.close({type: 'P'})`
`149`	`152`	`this.connection.sync()`
`150`	`153`	`this.state = 'done'`