Do not send close after readyForQuery

brianc · brianc · commit 620ddc0dede4 · 2017-08-04T17:40:52.000-05:00
Close is used to release a named portal (which isn't used by pg-cursor) or when you're early-terminating a cursor on the unnamed portal. Sending 'close' on an connection which has already sent 'readyForQuery' results in the connection responding with a _second_ 'readyForQuery' which causes a lot of issues within node-postgres as 'readyForQuery' is the signal to indicate the client has gone back into the idle state.
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'

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'`