Skip to content

Commit

Permalink
Fix compare (#1923)
Browse files Browse the repository at this point in the history
* Fix deepEqual compare

In node 12 assert.deepEqual against a buffer & array no longer passes if the values are the same.  This makes sense.  Updated the test to not use deepEqual in this case.
  • Loading branch information
brianc committed Jul 16, 2019
1 parent d8a0e1e commit 0acaf9d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion lib/native/client.js
Expand Up @@ -7,7 +7,7 @@
* README.md file in the root directory of this source tree.
*/

// eslint-disable-next-line node/no-missing-require
// eslint-disable-next-line
var Native = require('pg-native')
var TypeOverrides = require('../type-overrides')
var semver = require('semver')
Expand Down
35 changes: 18 additions & 17 deletions test/unit/utils-tests.js
Expand Up @@ -29,22 +29,22 @@ test('EventEmitter.once', function (t) {

test('normalizing query configs', function () {
var config
var callback = function () {}
var callback = function () { }

config = utils.normalizeQueryConfig({text: 'TEXT'})
assert.same(config, {text: 'TEXT'})
config = utils.normalizeQueryConfig({ text: 'TEXT' })
assert.same(config, { text: 'TEXT' })

config = utils.normalizeQueryConfig({text: 'TEXT'}, [10])
assert.deepEqual(config, {text: 'TEXT', values: [10]})
config = utils.normalizeQueryConfig({ text: 'TEXT' }, [10])
assert.deepEqual(config, { text: 'TEXT', values: [10] })

config = utils.normalizeQueryConfig({text: 'TEXT', values: [10]})
assert.deepEqual(config, {text: 'TEXT', values: [10]})
config = utils.normalizeQueryConfig({ text: 'TEXT', values: [10] })
assert.deepEqual(config, { text: 'TEXT', values: [10] })

config = utils.normalizeQueryConfig('TEXT', [10], callback)
assert.deepEqual(config, {text: 'TEXT', values: [10], callback: callback})
assert.deepEqual(config, { text: 'TEXT', values: [10], callback: callback })

config = utils.normalizeQueryConfig({text: 'TEXT', values: [10]}, callback)
assert.deepEqual(config, {text: 'TEXT', values: [10], callback: callback})
config = utils.normalizeQueryConfig({ text: 'TEXT', values: [10] }, callback)
assert.deepEqual(config, { text: 'TEXT', values: [10], callback: callback })
})

test('prepareValues: buffer prepared properly', function () {
Expand All @@ -57,7 +57,8 @@ test('prepareValues: Uint8Array prepared properly', function () {
var buf = new Uint8Array([1, 2, 3]).subarray(1, 2)
var out = utils.prepareValue(buf)
assert.ok(Buffer.isBuffer(out))
assert.deepEqual(out, [2])
assert.equal(out.length, 1)
assert.deepEqual(out[0], 2)
})

test('prepareValues: date prepared properly', function () {
Expand Down Expand Up @@ -167,12 +168,12 @@ test('prepareValue: objects with simple toPostgres prepared properly', function
assert.strictEqual(out, 'zomgcustom!')
})

test('prepareValue: buffer array prepared properly', function() {
var buffer1 = Buffer.from('dead', 'hex')
var buffer2 = Buffer.from('beef', 'hex')
var out = utils.prepareValue([buffer1, buffer2])
assert.strictEqual(out, '{\\\\xdead,\\\\xbeef}')
})
test('prepareValue: buffer array prepared properly', function () {
var buffer1 = Buffer.from('dead', 'hex')
var buffer2 = Buffer.from('beef', 'hex')
var out = utils.prepareValue([buffer1, buffer2])
assert.strictEqual(out, '{\\\\xdead,\\\\xbeef}')
})

test('prepareValue: objects with complex toPostgres prepared properly', function () {
var buf = Buffer.from('zomgcustom!')
Expand Down

0 comments on commit 0acaf9d

Please sign in to comment.