From 0b80abacaf261819f31f352b0b45264f107d42de Mon Sep 17 00:00:00 2001 From: Charmander <~@charmander.me> Date: Wed, 15 Nov 2017 22:44:13 -0800 Subject: [PATCH] Specify collation when relied on in tests Fixes #189. --- test/integration/client/api-tests.js | 2 +- test/integration/client/prepared-statement-tests.js | 4 ++-- test/integration/client/simple-query-tests.js | 4 ++-- test/native/evented-api-tests.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/client/api-tests.js b/test/integration/client/api-tests.js index 22fe96b2..acf403a4 100644 --- a/test/integration/client/api-tests.js +++ b/test/integration/client/api-tests.js @@ -26,7 +26,7 @@ suite.test('callback API', done => { client.query(config) client.query('INSERT INTO peep(name) VALUES ($1)', ['aaron']) - client.query('SELECT * FROM peep ORDER BY name', (err, res) => { + client.query('SELECT * FROM peep ORDER BY name COLLATE "C"', (err, res) => { assert(!err) assert.equal(res.rowCount, 3) assert.deepEqual(res.rows, [ diff --git a/test/integration/client/prepared-statement-tests.js b/test/integration/client/prepared-statement-tests.js index 6fdf72f6..188bf826 100644 --- a/test/integration/client/prepared-statement-tests.js +++ b/test/integration/client/prepared-statement-tests.js @@ -122,7 +122,7 @@ var suite = new helper.Suite() suite.test('with small row count', function (done) { var query = client.query(new Query({ name: 'get names', - text: 'SELECT name FROM zoom ORDER BY name', + text: 'SELECT name FROM zoom ORDER BY name COLLATE "C"', rows: 1 }, done)) @@ -132,7 +132,7 @@ var suite = new helper.Suite() suite.test('with large row count', function (done) { var query = client.query(new Query({ name: 'get names', - text: 'SELECT name FROM zoom ORDER BY name', + text: 'SELECT name FROM zoom ORDER BY name COLLATE "C"', rows: 1000 }, done)) checkForResults(query) diff --git a/test/integration/client/simple-query-tests.js b/test/integration/client/simple-query-tests.js index d7f1916a..0c4575c5 100644 --- a/test/integration/client/simple-query-tests.js +++ b/test/integration/client/simple-query-tests.js @@ -6,7 +6,7 @@ var Query = helper.pg.Query test('simple query interface', function () { var client = helper.client() - var query = client.query(new Query('select name from person order by name')) + var query = client.query(new Query('select name from person order by name collate "C"')) client.on('drain', client.end.bind(client)) @@ -43,7 +43,7 @@ test('prepared statements do not mutate params', function () { var params = [1] - var query = client.query(new Query('select name from person where $1 = 1 order by name', params)) + var query = client.query(new Query('select name from person where $1 = 1 order by name collate "C"', params)) assert.deepEqual(params, [1]) diff --git a/test/native/evented-api-tests.js b/test/native/evented-api-tests.js index 02a00cff..4fac0415 100644 --- a/test/native/evented-api-tests.js +++ b/test/native/evented-api-tests.js @@ -64,7 +64,7 @@ test('parameterized queries', function () { test('multiple parameters', function () { var client = setupClient() - var q = client.query(new Query('SELECT name FROM boom WHERE name = $1 or name = $2 ORDER BY name', ['Aaron', 'Brian'])) + var q = client.query(new Query('SELECT name FROM boom WHERE name = $1 or name = $2 ORDER BY name COLLATE "C"', ['Aaron', 'Brian'])) assert.emits(q, 'row', function (row) { assert.equal(row.name, 'Aaron') assert.emits(q, 'row', function (row) {