handle situation, when broken copy to query, ends before it is canceled

anton · brianc · commit 7ca21acb25be · 2013-01-20T19:45:41.000-06:00
diff --git a/lib/native/query.js b/lib/native/query.js
@@ -64,6 +64,9 @@ p.handleError = function(error) {
 }
 
 p.handleReadyForQuery = function(meta) {
+  if (this._canceledDueToError) {
+    return this.handleError(this._canceledDueToError);
+  }
   if(meta) {
     this._result.addCommandComplete(meta);
   }
diff --git a/lib/query.js b/lib/query.js
@@ -93,6 +93,9 @@ p.handleCommandComplete = function(msg) {
 };
 
 p.handleReadyForQuery = function() {
+  if (this._canceledDueToError) {
+    return this.handleError(this._canceledDueToError);
+  }
   if(this.callback) {
     this.callback(null, this._result);
   }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,9 @@ p.handleError = function(error) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`p.handleReadyForQuery = function(meta) {`
	`67`	`+ if (this._canceledDueToError) {`
	`68`	`+ return this.handleError(this._canceledDueToError);`
	`69`	`+ }`
`67`	`70`	`if(meta) {`
`68`	`71`	`this._result.addCommandComplete(meta);`
`69`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,9 @@ p.handleCommandComplete = function(msg) {`
`93`	`93`	`};`
`94`	`94`
`95`	`95`	`p.handleReadyForQuery = function() {`
	`96`	`+ if (this._canceledDueToError) {`
	`97`	`+ return this.handleError(this._canceledDueToError);`
	`98`	`+ }`
`96`	`99`	`if(this.callback) {`
`97`	`100`	`this.callback(null, this._result);`
`98`	`101`	`}`