From 37956e22c5c703cf9e9b91144d02f0febf4ca8aa Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 21 Feb 2015 17:32:39 +0100 Subject: [PATCH 1/2] Fix result.rowCount being a string instead of a number via native bindings. Fixes #708 --- lib/native/result.js | 3 +-- test/native/callback-api-tests.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/native/result.js b/lib/native/result.js index 5e202f1f..485f36b4 100644 --- a/lib/native/result.js +++ b/lib/native/result.js @@ -7,7 +7,7 @@ var NativeResult = module.exports = function(pq) { NativeResult.prototype.addCommandComplete = function(pq) { this.command = pq.cmdStatus().split(' ')[0]; - this.rowCount = pq.cmdTuples(); + this.rowCount = parseInt(pq.cmdTuples(), 10); var nfields = pq.nfields(); if(nfields < 1) return; @@ -19,4 +19,3 @@ NativeResult.prototype.addCommandComplete = function(pq) { }); } }; - diff --git a/test/native/callback-api-tests.js b/test/native/callback-api-tests.js index 0b713573..772e7014 100644 --- a/test/native/callback-api-tests.js +++ b/test/native/callback-api-tests.js @@ -8,6 +8,7 @@ test('fires callback with results', function() { client.query('SELECT 1 as num', assert.calls(function(err, result) { assert.isNull(err); assert.equal(result.rows[0].num, 1); + assert.equal(result.rowCount, 1); client.query('SELECT * FROM person WHERE name = $1', ['Brian'], assert.calls(function(err, result) { assert.isNull(err); assert.equal(result.rows[0].name, 'Brian'); From e5d2f96099cff2c17faa8a8a28cd5c90a5375b58 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sun, 22 Feb 2015 21:30:22 +0100 Subject: [PATCH 2/2] Use strictEqual instead --- test/native/callback-api-tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/native/callback-api-tests.js b/test/native/callback-api-tests.js index 772e7014..95e9a8ff 100644 --- a/test/native/callback-api-tests.js +++ b/test/native/callback-api-tests.js @@ -8,7 +8,7 @@ test('fires callback with results', function() { client.query('SELECT 1 as num', assert.calls(function(err, result) { assert.isNull(err); assert.equal(result.rows[0].num, 1); - assert.equal(result.rowCount, 1); + assert.strictEqual(result.rowCount, 1); client.query('SELECT * FROM person WHERE name = $1', ['Brian'], assert.calls(function(err, result) { assert.isNull(err); assert.equal(result.rows[0].name, 'Brian');