From 689bb25e86bcd9433b0cf4788f50ea2d3b324409 Mon Sep 17 00:00:00 2001
From: Josh <josh@phin.co>
Date: Tue, 29 Aug 2017 18:23:21 -0700
Subject: [PATCH] fixes

---
 package.json                                       | 3 ++-
 test/integration/client/appname-tests.js           | 9 +--------
 test/integration/client/statement_timeout-tests.js | 9 +--------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index fe251ab1..680a54d4 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/test/integration/client/appname-tests.js b/test/integration/client/appname-tests.js
index 4db5297c..e5883908 100644
--- a/test/integration/client/appname-tests.js
+++ b/test/integration/client/appname-tests.js
@@ -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) {
diff --git a/test/integration/client/statement_timeout-tests.js b/test/integration/client/statement_timeout-tests.js
index 5bf1e943..5574285c 100644
--- a/test/integration/client/statement_timeout-tests.js
+++ b/test/integration/client/statement_timeout-tests.js
@@ -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) {