From fa17b6882ae114e3f58d940df76257bfa77073b1 Mon Sep 17 00:00:00 2001 From: Mark Yen Date: Wed, 11 Jun 2014 18:18:11 -0700 Subject: [PATCH 1/2] Include port as a connection parameter for socket connections --- lib/connection-parameters.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/connection-parameters.js b/lib/connection-parameters.js index aa82e4a51..ff6b9d67e 100644 --- a/lib/connection-parameters.js +++ b/lib/connection-parameters.js @@ -39,6 +39,7 @@ var parse = function(str) { config.fallback_application_name = result.query.fallback_application_name; } + config.port = result.port; if(result.protocol == 'socket:') { config.host = decodeURI(result.pathname); config.database = result.query.db; @@ -50,7 +51,6 @@ var parse = function(str) { var auth = (result.auth || ':').split(':'); config.user = auth[0]; config.password = auth[1]; - config.port = result.port; var ssl = result.query.ssl; if (ssl === 'true' || ssl === '1') { @@ -66,7 +66,7 @@ var useSsl = function() { return false; case "prefer": case "require": - case "verify-ca": + case "verify-ca": case "verify-full": return true; } From bf2656944565a0cf2ce7f23a062f08a003e00a4f Mon Sep 17 00:00:00 2001 From: Mark Yen Date: Sun, 6 Jul 2014 11:48:09 -0700 Subject: [PATCH 2/2] Fixes travis build for 0.8 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6e4be29ac..993e442cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,3 +4,5 @@ node_js: - "0.10" before_script: - node script/create-test-tables.js pg://postgres@127.0.0.1:5432/postgres +before_install: + - npm install -g npm@~1.4.6