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

Merge pull request #34 from danielrozenberg/support-other-socket-modes

Browse Source 
Support more modes to set the host as a socket
This commit is contained in:
Herman J. Radtke III 2020-02-01 08:33:42 -08:00 committed by GitHub
commit 9b89828fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
index.js
View File

@ -35,13 +35,22 @@ function parse(str) {
config.client_encoding = result.query.encoding;
return config;
}
config.host = result.hostname;
if (!config.host) {
// Only set the host if there is no equivalent query param.
config.host = result.hostname;
}
// If the host is missing it might be a URL-encoded path to a socket.
var pathname = result.pathname;
if (!config.host && pathname && /^%2f/i.test(pathname)) {
var pathnameSplit = pathname.split('/');
config.host = decodeURIComponent(pathnameSplit[0]);
pathname = pathnameSplit.splice(1).join('/');
}
// 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;
pathname = pathname.slice(1) || null;
}
config.database = pathname && decodeURI(pathname);

37
test/parse.js
View File

@ -120,6 +120,43 @@ describe('parse', function(){
(subject.database === null).should.equal(true);
});
it('configuration parameter host', function() {
var subject = parse('pg://user:pass@/dbname?host=/unix/socket');
subject.user.should.equal('user');
subject.password.should.equal('pass');
subject.host.should.equal('/unix/socket');
subject.database.should.equal('dbname');
});
it('configuration parameter host overrides url host', function() {
var subject = parse('pg://user:pass@localhost/dbname?host=/unix/socket');
subject.host.should.equal('/unix/socket');
});
it('url with encoded socket', function() {
var subject = parse('pg://user:pass@%2Funix%2Fsocket/dbname');
subject.user.should.equal('user');
subject.password.should.equal('pass');
subject.host.should.equal('/unix/socket');
subject.database.should.equal('dbname');
});
it('url with real host and an encoded db name', function() {
var subject = parse('pg://user:pass@localhost/%2Fdbname');
subject.user.should.equal('user');
subject.password.should.equal('pass');
subject.host.should.equal('localhost');
subject.database.should.equal('%2Fdbname');
});
it('configuration parameter host treats encoded socket as part of the db name', function() {
var subject = parse('pg://user:pass@%2Funix%2Fsocket/dbname?host=localhost');
subject.user.should.equal('user');
subject.password.should.equal('pass');
subject.host.should.equal('localhost');
subject.database.should.equal('%2Funix%2Fsocket/dbname');
});
it('configuration parameter application_name', function(){
var connectionString = 'pg:///?application_name=TheApp';
var subject = parse(connectionString);