From 3c3208a9a50cc5fa10125157730efe35a3183935 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 01:48:46 +0200 Subject: [PATCH 01/36] Fix for issue 750: https://github.com/brianc/node-postgres/issues/750 --- lib/query.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/query.js b/lib/query.js index 69be6e473..51ab7884b 100644 --- a/lib/query.js +++ b/lib/query.js @@ -11,7 +11,7 @@ var Query = function(config, values, callback) { config = utils.normalizeQueryConfig(config, values, callback); this.text = config.text; - this.values = config.values; + this.values = config.values.slice(); this.rows = config.rows; this.types = config.types; this.name = config.name; From 6f4921b5a1dcfe9b31f91c94b0653b92350637f6 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 02:42:51 +0200 Subject: [PATCH 02/36] Tests for issue 750 --- test/unit/client/query-arguments-tests.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 test/unit/client/query-arguments-tests.js diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js new file mode 100644 index 000000000..019343c75 --- /dev/null +++ b/test/unit/client/query-arguments-tests.js @@ -0,0 +1,15 @@ +var helper = require(__dirname + "/test-helper"); + +test('check that passed arguments types are not changed during the query phase', function() { + var client = helper.client(); + var originalArguments = [1,2,3]; + var arguments = originalArguments.slice(); + client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2 AND 0 <> $3',arguments, function() { + // Check for length + assert.equal(arguments.length,originalArguments.length); + // Check values + assert.equal(arguments[0],originalArguments[0]); + assert.equal(arguments[1],originalArguments[1]); + assert.equal(arguments[2],originalArguments[2]); + }); +}); From ba80236e2f5c89fea4f827aa84d2d7c393955fae Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 02:46:02 +0200 Subject: [PATCH 03/36] testing --- lib/query.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/query.js b/lib/query.js index 51ab7884b..69be6e473 100644 --- a/lib/query.js +++ b/lib/query.js @@ -11,7 +11,7 @@ var Query = function(config, values, callback) { config = utils.normalizeQueryConfig(config, values, callback); this.text = config.text; - this.values = config.values.slice(); + this.values = config.values; this.rows = config.rows; this.types = config.types; this.name = config.name; From d7e88a3f16566b0bb00712d6b344421e5b87a72d Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 02:53:05 +0200 Subject: [PATCH 04/36] test update --- test/unit/client/query-arguments-tests.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 019343c75..60f3c34a8 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -8,8 +8,8 @@ test('check that passed arguments types are not changed during the query phase', // Check for length assert.equal(arguments.length,originalArguments.length); // Check values - assert.equal(arguments[0],originalArguments[0]); - assert.equal(arguments[1],originalArguments[1]); - assert.equal(arguments[2],originalArguments[2]); + assert.deepEqual(arguments[0],originalArguments[0]); + assert.deepEqual(arguments[1],originalArguments[1]); + assert.deepEqual(arguments[2],originalArguments[2]); }); }); From c86214db325e31997c5317eb242a89d4383ab111 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:02:19 +0200 Subject: [PATCH 05/36] test update --- test/unit/client/query-arguments-tests.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 60f3c34a8..87e85be19 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -7,9 +7,9 @@ test('check that passed arguments types are not changed during the query phase', client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2 AND 0 <> $3',arguments, function() { // Check for length assert.equal(arguments.length,originalArguments.length); - // Check values - assert.deepEqual(arguments[0],originalArguments[0]); - assert.deepEqual(arguments[1],originalArguments[1]); - assert.deepEqual(arguments[2],originalArguments[2]); + // Check values types, expect numbers, not strings + assert.deepEqual(isNaN(arguments[0]),true); + assert.deepEqual(isNaN(arguments[1]),true); + assert.deepEqual(isNaN(arguments[2]),true); }); }); From b58362f0adec3fa3fac45f9fea44af9633b1aede Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:08:19 +0200 Subject: [PATCH 06/36] test update --- test/unit/client/query-arguments-tests.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 87e85be19..e33cea90c 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -2,14 +2,13 @@ var helper = require(__dirname + "/test-helper"); test('check that passed arguments types are not changed during the query phase', function() { var client = helper.client(); - var originalArguments = [1,2,3]; + var originalArguments = [1,new Date()]; var arguments = originalArguments.slice(); - client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2 AND 0 <> $3',arguments, function() { + client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function() { // Check for length assert.equal(arguments.length,originalArguments.length); - // Check values types, expect numbers, not strings - assert.deepEqual(isNaN(arguments[0]),true); - assert.deepEqual(isNaN(arguments[1]),true); - assert.deepEqual(isNaN(arguments[2]),true); + // Check values types + assert.deepEqual(isNaN(arguments[0]),false); + assert.deepEqual(arguments[1] instanceof Date,true); }); }); From c6050d073e51bc095c1f79fbab20c80b28be14e1 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:16:36 +0200 Subject: [PATCH 07/36] test update --- test/unit/client/query-arguments-tests.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index e33cea90c..6a17b66e8 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -4,11 +4,13 @@ test('check that passed arguments types are not changed during the query phase', var client = helper.client(); var originalArguments = [1,new Date()]; var arguments = originalArguments.slice(); - client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function() { + client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function(err, result) { + assert.equal(err,null,'expecting no error'); + assert.equal(result.rows.length,1,'expecting 1 row'); // Check for length - assert.equal(arguments.length,originalArguments.length); + assert.equal(arguments.length,originalArguments.length,'expecting same lenght as given array!'); // Check values types - assert.deepEqual(isNaN(arguments[0]),false); - assert.deepEqual(arguments[1] instanceof Date,true); + assert.deepEqual(isNaN(arguments[0]),false,'expecting a number!'); + assert.deepEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); }); }); From 81427717f221a6a772230a9d145fe5684f118f5c Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:20:09 +0200 Subject: [PATCH 08/36] tests update --- test/unit/client/query-arguments-tests.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 6a17b66e8..f5d508f82 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -6,11 +6,14 @@ test('check that passed arguments types are not changed during the query phase', var arguments = originalArguments.slice(); client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function(err, result) { assert.equal(err,null,'expecting no error'); + console.log('err:',err); + console.log('result:',result.rows[0]); + console.log(arguments); assert.equal(result.rows.length,1,'expecting 1 row'); // Check for length assert.equal(arguments.length,originalArguments.length,'expecting same lenght as given array!'); // Check values types - assert.deepEqual(isNaN(arguments[0]),false,'expecting a number!'); - assert.deepEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); + assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); + assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); }); }); From 6a798bc8f0cfbd774bc716f1af679e49eb8ab389 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:32:56 +0200 Subject: [PATCH 09/36] test update --- test/unit/client/query-arguments-tests.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index f5d508f82..f742aa1cc 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -4,6 +4,13 @@ test('check that passed arguments types are not changed during the query phase', var client = helper.client(); var originalArguments = [1,new Date()]; var arguments = originalArguments.slice(); + var query = client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments); + // Check for length + assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); + // Check values types + assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); + assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); + /* client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function(err, result) { assert.equal(err,null,'expecting no error'); console.log('err:',err); @@ -16,4 +23,5 @@ test('check that passed arguments types are not changed during the query phase', assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); }); + */ }); From ab09b1b4168ad3835d8bf5987615b98791765f44 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:36:31 +0200 Subject: [PATCH 10/36] test update --- test/unit/client/query-arguments-tests.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index f742aa1cc..2f7383335 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -4,7 +4,14 @@ test('check that passed arguments types are not changed during the query phase', var client = helper.client(); var originalArguments = [1,new Date()]; var arguments = originalArguments.slice(); - var query = client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments); + //var query = client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments); + + + var query = client.query({ + text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', + values: arguments + }); + // Check for length assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); // Check values types From 65a8b3e0bda7b316100262e13155996059b1ef5b Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:39:19 +0200 Subject: [PATCH 11/36] again... --- test/unit/client/query-arguments-tests.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 2f7383335..0f5c4e6f0 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -4,19 +4,24 @@ test('check that passed arguments types are not changed during the query phase', var client = helper.client(); var originalArguments = [1,new Date()]; var arguments = originalArguments.slice(); - //var query = client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments); - - + var query = client.query({ text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', values: arguments }); + assert.emits(query,'end', function() { + test('parse argument', function() { + assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); + assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); + assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); + }); + }); + // Check for length - assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); + // Check values types - assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); - assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); + /* client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function(err, result) { assert.equal(err,null,'expecting no error'); From 0ad20a6d667a352897a0df690561c66577bdd1dd Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:44:49 +0200 Subject: [PATCH 12/36] test update --- test/unit/client/query-arguments-tests.js | 27 ++++------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 0f5c4e6f0..56493f9c9 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -1,39 +1,20 @@ var helper = require(__dirname + "/test-helper"); -test('check that passed arguments types are not changed during the query phase', function() { +test('executing query', function() { var client = helper.client(); var originalArguments = [1,new Date()]; var arguments = originalArguments.slice(); - + var query = client.query({ text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', values: arguments }); - assert.emits(query,'end', function() { - test('parse argument', function() { + assert.emits(query,'row', function(row) { + test('check that passed arguments types have not been changed during the query phase', function() { assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); }); }); - - // Check for length - - // Check values types - - /* - client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function(err, result) { - assert.equal(err,null,'expecting no error'); - console.log('err:',err); - console.log('result:',result.rows[0]); - console.log(arguments); - assert.equal(result.rows.length,1,'expecting 1 row'); - // Check for length - assert.equal(arguments.length,originalArguments.length,'expecting same lenght as given array!'); - // Check values types - assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); - assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); - }); - */ }); From ea42694b569a48de3809a51a34f6cc634eb07150 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:49:03 +0200 Subject: [PATCH 13/36] test update --- test/unit/client/query-arguments-tests.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 56493f9c9..454fbdc37 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -5,10 +5,7 @@ test('executing query', function() { var originalArguments = [1,new Date()]; var arguments = originalArguments.slice(); - var query = client.query({ - text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', - values: arguments - }); + var query = client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments); assert.emits(query,'row', function(row) { test('check that passed arguments types have not been changed during the query phase', function() { From 0621d2917af424dd8bd0f7640e829251d78f5bf8 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:53:35 +0200 Subject: [PATCH 14/36] test update --- test/unit/client/query-arguments-tests.js | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 454fbdc37..5f5af6e2d 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -1,17 +1,17 @@ var helper = require(__dirname + "/test-helper"); -test('executing query', function() { - var client = helper.client(); - var originalArguments = [1,new Date()]; - var arguments = originalArguments.slice(); +var client = helper.client(); +var originalArguments = [1,new Date()]; +var arguments = originalArguments.slice(); - var query = client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments); - - assert.emits(query,'row', function(row) { - test('check that passed arguments types have not been changed during the query phase', function() { - assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); - assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); - assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); - }); +client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments); +client.on('row', function(row) { + test('check that passed arguments types have not been changed during the query phase', function() { + assert.notEqual(row,undefined); + assert.notEqual(row,null); + assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); + assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); + assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); }); }); + From 1a2575bc89a25cd1a0504c73164a462aa196b031 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 03:59:13 +0200 Subject: [PATCH 15/36] tests --- test/unit/client/query-arguments-tests.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 5f5af6e2d..58286e0e9 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -1,17 +1,16 @@ var helper = require(__dirname + "/test-helper"); -var client = helper.client(); -var originalArguments = [1,new Date()]; -var arguments = originalArguments.slice(); +test('check that passed arguments types have not been changed during the query phase', function() { + var client = helper.client(); + var originalArguments = [1,new Date()]; + var arguments = originalArguments.slice(); -client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments); -client.on('row', function(row) { - test('check that passed arguments types have not been changed during the query phase', function() { - assert.notEqual(row,undefined); - assert.notEqual(row,null); + client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function(err,result) { + assert.isNull(err); + assert.notEqual(result,undefined); + assert.equal(result.rows.length,1,'expecting 1 row'); assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); }); -}); - +}); \ No newline at end of file From 1acf366bb1718742c01cc61c87d90df616c3b82b Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 04:08:38 +0200 Subject: [PATCH 16/36] test --- test/unit/client/query-arguments-tests.js | 32 ++++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index 58286e0e9..d1ae551aa 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -1,16 +1,22 @@ -var helper = require(__dirname + "/test-helper"); +var helper = require('./test-helper'); +var Client = helper.Client; +var conInfo = helper.config; test('check that passed arguments types have not been changed during the query phase', function() { - var client = helper.client(); - var originalArguments = [1,new Date()]; - var arguments = originalArguments.slice(); - - client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',arguments, function(err,result) { - assert.isNull(err); - assert.notEqual(result,undefined); - assert.equal(result.rows.length,1,'expecting 1 row'); - assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); - assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); - assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); - }); + var client = new Client(conInfo); + client.connect(assert.success(function() { + var originalArguments = [1,new Date()]; + var arguments = originalArguments.slice(); + var config = { + text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', + values: arguments + }; + var query = client.query(config, assert.success(function(result) { + assert.equal(result.rows.length, 1); + assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); + assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); + assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); + client.end(); + })); + })); }); \ No newline at end of file From 5cbab7cf23c56602ceb6540372da421018a0fabf Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 04:15:29 +0200 Subject: [PATCH 17/36] test update --- test/unit/client/query-arguments-tests.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/client/query-arguments-tests.js b/test/unit/client/query-arguments-tests.js index d1ae551aa..59c3b99c8 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/unit/client/query-arguments-tests.js @@ -1,4 +1,4 @@ -var helper = require('./test-helper'); +var helper = require(__dirname + '/test-helper'); var Client = helper.Client; var conInfo = helper.config; @@ -11,7 +11,7 @@ test('check that passed arguments types have not been changed during the query p text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', values: arguments }; - var query = client.query(config, assert.success(function(result) { + client.query(config, assert.success(function(result) { assert.equal(result.rows.length, 1); assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); From 570b444c29f98b8584c32e18afa5d7ff744f9a51 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 04:22:24 +0200 Subject: [PATCH 18/36] test update --- .../client/query-arguments-test.js} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/{unit/client/query-arguments-tests.js => integration/client/query-arguments-test.js} (94%) diff --git a/test/unit/client/query-arguments-tests.js b/test/integration/client/query-arguments-test.js similarity index 94% rename from test/unit/client/query-arguments-tests.js rename to test/integration/client/query-arguments-test.js index 59c3b99c8..ab0c7dc1f 100644 --- a/test/unit/client/query-arguments-tests.js +++ b/test/integration/client/query-arguments-test.js @@ -1,4 +1,4 @@ -var helper = require(__dirname + '/test-helper'); +var helper = require('./test-helper'); var Client = helper.Client; var conInfo = helper.config; From 4fde4c92ca20d20f78ae44583bf97c4b68e44556 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 04:26:30 +0200 Subject: [PATCH 19/36] update --- test/integration/client/query-arguments-test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/client/query-arguments-test.js b/test/integration/client/query-arguments-test.js index ab0c7dc1f..80ed136bb 100644 --- a/test/integration/client/query-arguments-test.js +++ b/test/integration/client/query-arguments-test.js @@ -13,6 +13,7 @@ test('check that passed arguments types have not been changed during the query p }; client.query(config, assert.success(function(result) { assert.equal(result.rows.length, 1); + console.log('result:',result.rows[0]); assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); From cbca4573a3304d9aa20f69d71174fb8315e68288 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 04:29:41 +0200 Subject: [PATCH 20/36] update --- test/{integration => unit}/client/query-arguments-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/{integration => unit}/client/query-arguments-test.js (94%) diff --git a/test/integration/client/query-arguments-test.js b/test/unit/client/query-arguments-test.js similarity index 94% rename from test/integration/client/query-arguments-test.js rename to test/unit/client/query-arguments-test.js index 80ed136bb..503e586b2 100644 --- a/test/integration/client/query-arguments-test.js +++ b/test/unit/client/query-arguments-test.js @@ -1,4 +1,4 @@ -var helper = require('./test-helper'); +var helper = require(__dirname + '/test-helper'); var Client = helper.Client; var conInfo = helper.config; From fb898835edfe9304e09614ab5a0c19137524433e Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 04:38:23 +0200 Subject: [PATCH 21/36] update --- .../client/{query-arguments-test.js => query-args-types-test.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/unit/client/{query-arguments-test.js => query-args-types-test.js} (100%) diff --git a/test/unit/client/query-arguments-test.js b/test/unit/client/query-args-types-test.js similarity index 100% rename from test/unit/client/query-arguments-test.js rename to test/unit/client/query-args-types-test.js From cbf2e51630e7776571dc68fed071ec83e6d61b67 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 04:42:35 +0200 Subject: [PATCH 22/36] Query arguments tests --- test/unit/client/query-args-test.js | 26 +++++++++++++++++++++++ test/unit/client/query-args-types-test.js | 23 -------------------- 2 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 test/unit/client/query-args-test.js delete mode 100644 test/unit/client/query-args-types-test.js diff --git a/test/unit/client/query-args-test.js b/test/unit/client/query-args-test.js new file mode 100644 index 000000000..98ac3de7c --- /dev/null +++ b/test/unit/client/query-args-test.js @@ -0,0 +1,26 @@ +/** + * Created by nick on 31/03/15. + */ +var helper = require(__dirname + '/test-helper'); +var Client = helper.Client; +var conInfo = helper.config; + +test('check that passed values types have not been changed during the query phase', function() { + var client = new Client(conInfo); + client.connect(assert.success(function() { + var originalValues = [1,new Date()]; + var values = originalValues.slice(); + var config = { + text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', + values: values + }; + client.query(config, assert.success(function(result) { + assert.equal(result.rows.length, 1); + console.log('result:',result.rows[0]); + assert.equal(values.length,originalValues.length,'expecting same length as given array!'); + assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); + assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); + client.end(); + })); + })); +}); \ No newline at end of file diff --git a/test/unit/client/query-args-types-test.js b/test/unit/client/query-args-types-test.js deleted file mode 100644 index 503e586b2..000000000 --- a/test/unit/client/query-args-types-test.js +++ /dev/null @@ -1,23 +0,0 @@ -var helper = require(__dirname + '/test-helper'); -var Client = helper.Client; -var conInfo = helper.config; - -test('check that passed arguments types have not been changed during the query phase', function() { - var client = new Client(conInfo); - client.connect(assert.success(function() { - var originalArguments = [1,new Date()]; - var arguments = originalArguments.slice(); - var config = { - text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', - values: arguments - }; - client.query(config, assert.success(function(result) { - assert.equal(result.rows.length, 1); - console.log('result:',result.rows[0]); - assert.equal(arguments.length,originalArguments.length,'expecting same length as given array!'); - assert.strictEqual(isNaN(arguments[0]),false,'expecting a number!'); - assert.strictEqual(arguments[1] instanceof Date,true,'expecting a Date object!'); - client.end(); - })); - })); -}); \ No newline at end of file From 0bfb3b649285bc167c3eb3e1238c202dea18e7c5 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 04:46:18 +0200 Subject: [PATCH 23/36] test update --- test/unit/client/query-args-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/client/query-args-test.js b/test/unit/client/query-args-test.js index 98ac3de7c..f4ce35cfb 100644 --- a/test/unit/client/query-args-test.js +++ b/test/unit/client/query-args-test.js @@ -14,13 +14,13 @@ test('check that passed values types have not been changed during the query phas text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', values: values }; - client.query(config, assert.success(function(result) { + client.query(config, function(result) { assert.equal(result.rows.length, 1); console.log('result:',result.rows[0]); assert.equal(values.length,originalValues.length,'expecting same length as given array!'); assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); client.end(); - })); + }); })); }); \ No newline at end of file From c58e083a68a58056b223ab864adf04a092b877b6 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:18:41 +0200 Subject: [PATCH 24/36] test fix --- test/unit/client/query-args-test.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/unit/client/query-args-test.js b/test/unit/client/query-args-test.js index f4ce35cfb..13e321705 100644 --- a/test/unit/client/query-args-test.js +++ b/test/unit/client/query-args-test.js @@ -1,6 +1,3 @@ -/** - * Created by nick on 31/03/15. - */ var helper = require(__dirname + '/test-helper'); var Client = helper.Client; var conInfo = helper.config; From b248239e5d95c476f8a520d360a4b658fc1b2f63 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:24:18 +0200 Subject: [PATCH 25/36] new test --- test/unit/client/nick-test.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 test/unit/client/nick-test.js diff --git a/test/unit/client/nick-test.js b/test/unit/client/nick-test.js new file mode 100644 index 000000000..38bd9e7a5 --- /dev/null +++ b/test/unit/client/nick-test.js @@ -0,0 +1,21 @@ +var helper = require(__dirname + '/test-helper'); + +test('check that passed values types have not been changed during the query phase', function() { + var client = createClient(); + client.connect(assert.success(function() { + var originalValues = [1,new Date()]; + var values = originalValues.slice(); + var config = { + text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', + values: values + }; + client.query(config, function(result) { + assert.equal(result.rows.length, 1); + console.log('result:',result.rows[0]); + assert.equal(values.length,originalValues.length,'expecting same length as given array!'); + assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); + assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); + client.end(); + }); + })); +}); \ No newline at end of file From b42ad00ca2260733846de76776b02fa2911d93a0 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:28:50 +0200 Subject: [PATCH 26/36] test name update --- test/unit/client/{nick-test.js => nick-tests.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/unit/client/{nick-test.js => nick-tests.js} (100%) diff --git a/test/unit/client/nick-test.js b/test/unit/client/nick-tests.js similarity index 100% rename from test/unit/client/nick-test.js rename to test/unit/client/nick-tests.js From 0000591a2404ae7183f0ef966a2f7b8899e630b4 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:31:30 +0200 Subject: [PATCH 27/36] tests --- test/unit/client/nick-tests.js | 21 ------------------- ...query-args-test.js => query-args-tests.js} | 0 2 files changed, 21 deletions(-) delete mode 100644 test/unit/client/nick-tests.js rename test/unit/client/{query-args-test.js => query-args-tests.js} (100%) diff --git a/test/unit/client/nick-tests.js b/test/unit/client/nick-tests.js deleted file mode 100644 index 38bd9e7a5..000000000 --- a/test/unit/client/nick-tests.js +++ /dev/null @@ -1,21 +0,0 @@ -var helper = require(__dirname + '/test-helper'); - -test('check that passed values types have not been changed during the query phase', function() { - var client = createClient(); - client.connect(assert.success(function() { - var originalValues = [1,new Date()]; - var values = originalValues.slice(); - var config = { - text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', - values: values - }; - client.query(config, function(result) { - assert.equal(result.rows.length, 1); - console.log('result:',result.rows[0]); - assert.equal(values.length,originalValues.length,'expecting same length as given array!'); - assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); - assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); - client.end(); - }); - })); -}); \ No newline at end of file diff --git a/test/unit/client/query-args-test.js b/test/unit/client/query-args-tests.js similarity index 100% rename from test/unit/client/query-args-test.js rename to test/unit/client/query-args-tests.js From d4fce58c541a77b02c930e826a92ef986bc23421 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:34:17 +0200 Subject: [PATCH 28/36] tests --- test/unit/client/query-args-tests.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/unit/client/query-args-tests.js b/test/unit/client/query-args-tests.js index 13e321705..3e2c7ffd7 100644 --- a/test/unit/client/query-args-tests.js +++ b/test/unit/client/query-args-tests.js @@ -1,9 +1,7 @@ var helper = require(__dirname + '/test-helper'); -var Client = helper.Client; -var conInfo = helper.config; test('check that passed values types have not been changed during the query phase', function() { - var client = new Client(conInfo); + var client = helper.client(); client.connect(assert.success(function() { var originalValues = [1,new Date()]; var values = originalValues.slice(); From e703826c4615d63644dd0c1e21c9892d6b502d69 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:38:58 +0200 Subject: [PATCH 29/36] tests --- test/unit/client/query-args-tests.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/test/unit/client/query-args-tests.js b/test/unit/client/query-args-tests.js index 3e2c7ffd7..9d2ed1088 100644 --- a/test/unit/client/query-args-tests.js +++ b/test/unit/client/query-args-tests.js @@ -1,5 +1,5 @@ var helper = require(__dirname + '/test-helper'); - +/* test('check that passed values types have not been changed during the query phase', function() { var client = helper.client(); client.connect(assert.success(function() { @@ -18,4 +18,23 @@ test('check that passed values types have not been changed during the query phas client.end(); }); })); +}); +*/ +test('check that passed values types have not been changed during the query phase', function() { + var client = helper.client(); + + var originalValues = [1,new Date()]; + var values = originalValues.slice(); + var config = { + text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', + values: values + }; + client.query(config, function(result) { + assert.equal(result.rows.length, 1); + console.log('result:',result.rows[0]); + assert.equal(values.length,originalValues.length,'expecting same length as given array!'); + assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); + assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); + client.end(); + }); }); \ No newline at end of file From 2799cca4db200954675f04537731ae723b512c71 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:45:31 +0200 Subject: [PATCH 30/36] tests --- test/unit/client/query-args-tests.js | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/test/unit/client/query-args-tests.js b/test/unit/client/query-args-tests.js index 9d2ed1088..853d01515 100644 --- a/test/unit/client/query-args-tests.js +++ b/test/unit/client/query-args-tests.js @@ -19,7 +19,7 @@ test('check that passed values types have not been changed during the query phas }); })); }); -*/ + test('check that passed values types have not been changed during the query phase', function() { var client = helper.client(); @@ -37,4 +37,20 @@ test('check that passed values types have not been changed during the query phas assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); client.end(); }); -}); \ No newline at end of file +}); +*/ +var client = helper.client(); + +test('check that passed values types have not been changed during the query phase', assert.calls(function() { + var originalValues = [1,new Date()]; + var values = originalValues.slice(); + + client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, function(err, result) { + assert.isNull(err); + assert.equal(result.rows.length, 1); + console.log('result:',result.rows[0]); + assert.equal(values.length,originalValues.length,'expecting same length as given array!'); + assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); + assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); + }) +})); \ No newline at end of file From 0ceda5f8180f3549798345ea2225f1cee409712f Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:54:38 +0200 Subject: [PATCH 31/36] tests --- test/unit/client/query-args-tests.js | 66 +++++++++++----------------- 1 file changed, 25 insertions(+), 41 deletions(-) diff --git a/test/unit/client/query-args-tests.js b/test/unit/client/query-args-tests.js index 853d01515..2ef472c36 100644 --- a/test/unit/client/query-args-tests.js +++ b/test/unit/client/query-args-tests.js @@ -1,44 +1,5 @@ -var helper = require(__dirname + '/test-helper'); /* -test('check that passed values types have not been changed during the query phase', function() { - var client = helper.client(); - client.connect(assert.success(function() { - var originalValues = [1,new Date()]; - var values = originalValues.slice(); - var config = { - text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', - values: values - }; - client.query(config, function(result) { - assert.equal(result.rows.length, 1); - console.log('result:',result.rows[0]); - assert.equal(values.length,originalValues.length,'expecting same length as given array!'); - assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); - assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); - client.end(); - }); - })); -}); - -test('check that passed values types have not been changed during the query phase', function() { - var client = helper.client(); - - var originalValues = [1,new Date()]; - var values = originalValues.slice(); - var config = { - text: 'SELECT 1 WHERE 0 <> $1 AND 0 <> $2', - values: values - }; - client.query(config, function(result) { - assert.equal(result.rows.length, 1); - console.log('result:',result.rows[0]); - assert.equal(values.length,originalValues.length,'expecting same length as given array!'); - assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); - assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); - client.end(); - }); -}); -*/ +var helper = require(__dirname+'/test-helper'); var client = helper.client(); test('check that passed values types have not been changed during the query phase', assert.calls(function() { @@ -53,4 +14,27 @@ test('check that passed values types have not been changed during the query phas assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); }) -})); \ No newline at end of file +})); */ + +var helper = require(__dirname + '/test-helper'); +var pg = helper.pg; +var config = helper.config; + +test('check that passed values types have not been changed during the query phase', function() { + + pg.connect(config, assert.success(function(client, done) { + var originalValues = [1,new Date()]; + var values = originalValues.slice(); + + client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, assert.success(function(err,result) { + assert.isNull(err); + assert.equal(result.rows.length, 1); + console.log('result:',result.rows[0]); + assert.equal(values.length,originalValues.length,'expecting same length as given array!'); + assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); + assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); + done(); + })); + + })); +}); \ No newline at end of file From 8a868f476ec0430a15805d9956b6983ae52dde9e Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 13:57:49 +0200 Subject: [PATCH 32/36] tests --- test/{unit => integration}/client/query-args-tests.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/{unit => integration}/client/query-args-tests.js (100%) diff --git a/test/unit/client/query-args-tests.js b/test/integration/client/query-args-tests.js similarity index 100% rename from test/unit/client/query-args-tests.js rename to test/integration/client/query-args-tests.js From 2aba95ea362446b231784ddb142625cd4c672c4c Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 14:02:52 +0200 Subject: [PATCH 33/36] tests --- test/integration/client/query-args-tests.js | 22 ++------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/test/integration/client/query-args-tests.js b/test/integration/client/query-args-tests.js index 2ef472c36..bd98a7e96 100644 --- a/test/integration/client/query-args-tests.js +++ b/test/integration/client/query-args-tests.js @@ -1,21 +1,3 @@ -/* -var helper = require(__dirname+'/test-helper'); -var client = helper.client(); - -test('check that passed values types have not been changed during the query phase', assert.calls(function() { - var originalValues = [1,new Date()]; - var values = originalValues.slice(); - - client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, function(err, result) { - assert.isNull(err); - assert.equal(result.rows.length, 1); - console.log('result:',result.rows[0]); - assert.equal(values.length,originalValues.length,'expecting same length as given array!'); - assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); - assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); - }) -})); */ - var helper = require(__dirname + '/test-helper'); var pg = helper.pg; var config = helper.config; @@ -23,7 +5,7 @@ var config = helper.config; test('check that passed values types have not been changed during the query phase', function() { pg.connect(config, assert.success(function(client, done) { - var originalValues = [1,new Date()]; + var originalValues = [1,2]; var values = originalValues.slice(); client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, assert.success(function(err,result) { @@ -32,7 +14,7 @@ test('check that passed values types have not been changed during the query phas console.log('result:',result.rows[0]); assert.equal(values.length,originalValues.length,'expecting same length as given array!'); assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); - assert.strictEqual(values[1] instanceof Date,true,'expecting a Date object!'); + assert.strictEqual(isNaN(values[1]),false,'expecting a number!'); done(); })); From ca62ae34f14c672a24cbc672b2f3b6dc6ea5eed5 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 14:04:48 +0200 Subject: [PATCH 34/36] tests --- test/integration/client/query-args-tests.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/integration/client/query-args-tests.js b/test/integration/client/query-args-tests.js index bd98a7e96..ef5d8de7a 100644 --- a/test/integration/client/query-args-tests.js +++ b/test/integration/client/query-args-tests.js @@ -9,7 +9,8 @@ test('check that passed values types have not been changed during the query phas var values = originalValues.slice(); client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, assert.success(function(err,result) { - assert.isNull(err); + //assert.isNull(err); + console.log('err:',err); assert.equal(result.rows.length, 1); console.log('result:',result.rows[0]); assert.equal(values.length,originalValues.length,'expecting same length as given array!'); From ed204e79001ac8d8e15e3289c5ed25a0331bffd6 Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 14:07:24 +0200 Subject: [PATCH 35/36] tests --- test/integration/client/query-args-tests.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/integration/client/query-args-tests.js b/test/integration/client/query-args-tests.js index ef5d8de7a..503d67b54 100644 --- a/test/integration/client/query-args-tests.js +++ b/test/integration/client/query-args-tests.js @@ -8,11 +8,9 @@ test('check that passed values types have not been changed during the query phas var originalValues = [1,2]; var values = originalValues.slice(); - client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, assert.success(function(err,result) { - //assert.isNull(err); - console.log('err:',err); - assert.equal(result.rows.length, 1); - console.log('result:',result.rows[0]); + client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, assert.success(function(result) { + console.log('result:',result); + assert.equal(result.rowCount, 1); assert.equal(values.length,originalValues.length,'expecting same length as given array!'); assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); assert.strictEqual(isNaN(values[1]),false,'expecting a number!'); From d51db34cb9d1479dfd72ab230e8fb0a5f6780f9b Mon Sep 17 00:00:00 2001 From: Nicola Gervasi Date: Tue, 31 Mar 2015 15:36:53 +0200 Subject: [PATCH 36/36] tests --- test/integration/client/query-args-tests.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/client/query-args-tests.js b/test/integration/client/query-args-tests.js index 503d67b54..1cf03e0ee 100644 --- a/test/integration/client/query-args-tests.js +++ b/test/integration/client/query-args-tests.js @@ -8,14 +8,14 @@ test('check that passed values types have not been changed during the query phas var originalValues = [1,2]; var values = originalValues.slice(); - client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, assert.success(function(result) { + client.query('SELECT 1 WHERE 0 <> $1 AND 0 <> $2',values, function(result) { console.log('result:',result); assert.equal(result.rowCount, 1); assert.equal(values.length,originalValues.length,'expecting same length as given array!'); assert.strictEqual(isNaN(values[0]),false,'expecting a number!'); assert.strictEqual(isNaN(values[1]),false,'expecting a number!'); done(); - })); + }); })); }); \ No newline at end of file