Make cancel query tests pass

brianc · brianc · commit 3867851341b8 · 2014-10-09T21:12:17.000-04:00
diff --git a/lib/index.js b/lib/index.js
@@ -55,6 +55,9 @@ PG.prototype.connect = function(config, callback) {
 
 // cancel the query runned by the given client
 PG.prototype.cancel = function(config, client, query) {
+  if(client.native) {
+    return client.cancel(query);
+  }
   var c = config;
   //allow for no config to be passed
   if(typeof c === 'function') {
diff --git a/lib/native/index.js b/lib/native/index.js
@@ -146,3 +146,11 @@ Client.prototype._pulseQueryQueue = function(initialConnection) {
     self._pulseQueryQueue();
   });
 };
+
+Client.prototype.cancel = function(query) {
+  if(this._activeQuery == query) {
+    this.native.cancel(function() {});
+  } else if (this._queryQueue.indexOf(query) != -1) {
+    this._queryQueue.splice(this._queryQueue.indexOf(query), 1);
+  }
+};
diff --git a/lib/native/query.js b/lib/native/query.js
@@ -70,7 +70,7 @@ NativeQuery.prototype.handleError = function(err) {
     self.emit('error', err);
   }
   self.state = 'error';
-}
+};
 
 NativeQuery.prototype.submit = function(client) {
   this.state = 'running';
@@ -104,7 +104,7 @@ NativeQuery.prototype.submit = function(client) {
     if(self.callback) {
       self.callback(null, result);
     }
-  }
+  };
 
   if(process.domain) {
     after = process.domain.bind(after);
@@ -124,11 +124,11 @@ NativeQuery.prototype.submit = function(client) {
       if(err) return self.handleError(err);
       client.namedQueries[self.name] = true;
       return self.native.execute(self.name, values, after);
-    })
+    });
   }
   else if(this.values) {
-    var values = this.values.map(utils.prepareValue);
-    this.native.query(this.text, values, after);
+    var vals = this.values.map(utils.prepareValue);
+    this.native.query(this.text, vals, after);
   } else {
     this.native.query(this.text, after);
   }
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "nan": "~1.3.0",
     "packet-reader": "0.2.0",
     "pg-connection-string": "0.1.1",
-    "pg-native": "1.0.2",
+    "pg-native": "1.1.0",
     "pg-types": "1.4.0",
     "pgpass": "0.0.3"
   },
diff --git a/test/integration/client/cancel-query-tests.js b/test/integration/client/cancel-query-tests.js
@@ -1,4 +1,3 @@
-return console.log('cancel-query-tests.js: GET TO PASS');
 var helper = require(__dirname+"/test-helper");
 
 //before running this test make sure you run the script create-test-tables
@@ -10,35 +9,29 @@ test("cancellation of a query", function() {
 
   client.on('drain', client.end.bind(client));
 
-  var rows1 = 0, rows2 = 0, rows3 = 0, rows4 = 0;
+  var rows3 = 0;
 
   var query1 = client.query(qry);
   query1.on('row', function(row) {
-    rows1++;
+    throw new Error('Should not emit a row')
   });
   var query2 = client.query(qry);
   query2.on('row', function(row) {
-    rows2++;
+    throw new Error('Should not emit a row')
   });
   var query3 = client.query(qry);
   query3.on('row', function(row) {
     rows3++;
   });
   var query4 = client.query(qry);
   query4.on('row', function(row) {
-    rows4++;
+    throw new Error('Should not emit a row')
   });
 
   helper.pg.cancel(helper.config, client, query1);
   helper.pg.cancel(helper.config, client, query2);
   helper.pg.cancel(helper.config, client, query4);
 
-  setTimeout(function() {
-    assert.equal(rows1, 0);
-    assert.equal(rows2, 0);
-    assert.equal(rows4, 0);
-  }, 2000);
-
   assert.emits(query3, 'end', function() {
     test("returned right number of rows", function() {
       assert.equal(rows3, 26);
diff --git a/test/integration/client/results-as-array-tests.js b/test/integration/client/results-as-array-tests.js
@@ -1,3 +1,7 @@
+console.log('results-as-array: GET TO PASS')
+console.log('results-as-array: GET TO PASS')
+console.log('results-as-array: GET TO PASS')
+console.log('results-as-array: GET TO PASS')
 return console.log('results-as-array: GET TO PASS')
 var util = require('util');
 var helper = require('./test-helper');
diff --git a/test/integration/client/simple-query-tests.js b/test/integration/client/simple-query-tests.js
@@ -51,7 +51,7 @@ test("multiple simple queries", function() {
 });
 
 test("multiple select statements", function() {
-  return console.log('MUST SUPPORT MULTIPLE SIMPLE QURIES')
+  return console.log('DEPRECATED - multiple queries')
   var client = helper.client();
   client.query("create temp table boom(age integer); insert into boom(age) values(1); insert into boom(age) values(2); insert into boom(age) values(3)");
   client.query({text: "create temp table bang(name varchar(5)); insert into bang(name) values('zoom');"});
