archive-gh-me/node-postgres
1
0
Fork 0
mirror of https://github.com/brianc/node-postgres.git synced 2025-12-08 20:16:25 +00:00
Code Issues Projects Releases Wiki Activity

Support usage of relative urls to set database on the default host

Browse Source
This commit is contained in:
matthew.blasius 2014-09-12 11:21:33 -04:00
parent cb9bee1bc9
commit ba511f7803
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
index.js
View File

@ -36,7 +36,15 @@ function parse(str) {
return config;
}
config.host = result.hostname;
config.database = result.pathname ? decodeURI(result.pathname.slice(1)) : null;
// result.pathname is not always guaranteed to have a '/' prefix (e.g. relative urls)
// only strip the slash if it is present.
var pathname = result.pathname;
if (pathname && pathname.charAt(0) === '/') {
pathname = result.pathname.slice(1) || null;
}
config.database = pathname && decodeURI(pathname);
var auth = (result.auth || ':').split(':');
config.user = auth[0];
config.password = auth[1];

23
test/parse.js
View File

@ -87,3 +87,26 @@ test('url is properly encoded', function(t){
t.equal(subject.database, ' u%20rl');
t.end();
});
test('relative url sets database', function(t){
var relative = 'different_db_on_default_host';
var subject = parse(relative);
t.equal(subject.database, 'different_db_on_default_host');
t.end();
});
test('no pathname returns null database', function (t) {
var subject = parse('pg://myhost');
t.equal(subject.host, 'myhost');
t.type(subject.database, 'null');
t.end();
});
test('pathname of "/" returns null database', function (t) {
var subject = parse('pg://myhost/');
t.equal(subject.host, 'myhost');
t.type(subject.database, 'null');
t.end();
});