This commit is contained in:
Josh 2017-08-29 18:23:21 -07:00 committed by Brian C
parent 78fc90366d
commit 689bb25e86
3 changed files with 4 additions and 17 deletions

View File

@ -19,9 +19,10 @@
"main": "./lib",
"dependencies": {
"buffer-writer": "1.0.1",
"packet-reader": "0.3.1",
"js-string-escape": "1.0.1",
"packet-reader": "0.3.1",
"pg-connection-string": "0.1.3",
"pg-native": "^2.2.0",
"pg-pool": "~2.0.3",
"pg-types": "~1.12.1",
"pgpass": "1.x",

View File

@ -7,14 +7,7 @@ var suite = new helper.Suite()
var conInfo = helper.config
function getConInfo (override) {
var newConInfo = {}
Object.keys(conInfo).forEach(function (k) {
newConInfo[k] = conInfo[k]
})
Object.keys(override || {}).forEach(function (k) {
newConInfo[k] = override[k]
})
return newConInfo
return Object.assign({}, conInfo, override )
}
function getAppName (conf, cb) {

View File

@ -7,14 +7,7 @@ var suite = new helper.Suite()
var conInfo = helper.config
function getConInfo (override) {
var newConInfo = {}
Object.keys(conInfo).forEach(function (k) {
newConInfo[k] = conInfo[k]
})
Object.keys(override || {}).forEach(function (k) {
newConInfo[k] = override[k]
})
return newConInfo
return Object.assign({}, conInfo, override )
}
function getStatementTimeout (conf, cb) {