Skip to content

Commit

Permalink
Merge pull request #604 from markyen/socket-port
Browse files Browse the repository at this point in the history
Include port as a connection parameter for socket connections
  • Loading branch information
brianc committed Jul 6, 2014
2 parents d9b72f5 + bf26569 commit 8592be7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Expand Up @@ -3,3 +3,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
4 changes: 2 additions & 2 deletions lib/connection-parameters.js
Expand Up @@ -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;
Expand All @@ -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') {
Expand All @@ -66,7 +66,7 @@ var useSsl = function() {
return false;
case "prefer":
case "require":
case "verify-ca":
case "verify-ca":
case "verify-full":
return true;
}
Expand Down

0 comments on commit 8592be7

Please sign in to comment.