Skip to content

Commit 689bb25

Browse files
Joshbrianc
Josh
authored andcommitted
fixes
1 parent 78fc903 commit 689bb25

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
"main": "./lib",
2020
"dependencies": {
2121
"buffer-writer": "1.0.1",
22-
"packet-reader": "0.3.1",
2322
"js-string-escape": "1.0.1",
23+
"packet-reader": "0.3.1",
2424
"pg-connection-string": "0.1.3",
25+
"pg-native": "^2.2.0",
2526
"pg-pool": "~2.0.3",
2627
"pg-types": "~1.12.1",
2728
"pgpass": "1.x",

test/integration/client/appname-tests.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ var suite = new helper.Suite()
77
var conInfo = helper.config
88

99
function getConInfo (override) {
10-
var newConInfo = {}
11-
Object.keys(conInfo).forEach(function (k) {
12-
newConInfo[k] = conInfo[k]
13-
})
14-
Object.keys(override || {}).forEach(function (k) {
15-
newConInfo[k] = override[k]
16-
})
17-
return newConInfo
10+
return Object.assign({}, conInfo, override )
1811
}
1912

2013
function getAppName (conf, cb) {

test/integration/client/statement_timeout-tests.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ var suite = new helper.Suite()
77
var conInfo = helper.config
88

99
function getConInfo (override) {
10-
var newConInfo = {}
11-
Object.keys(conInfo).forEach(function (k) {
12-
newConInfo[k] = conInfo[k]
13-
})
14-
Object.keys(override || {}).forEach(function (k) {
15-
newConInfo[k] = override[k]
16-
})
17-
return newConInfo
10+
return Object.assign({}, conInfo, override )
1811
}
1912

2013
function getStatementTimeout (conf, cb) {

0 commit comments

Comments
 (0)