mirror of
https://github.com/brianc/node-postgres.git
synced 2026-01-18 15:55:05 +00:00
fixes
This commit is contained in:
parent
78fc90366d
commit
689bb25e86
@ -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",
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user