Skip to content

Commit

Permalink
Merge fadcf7a into 248e212
Browse files Browse the repository at this point in the history
  • Loading branch information
VitalyOstanin committed Oct 16, 2017
2 parents 248e212 + fadcf7a commit 76e031b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/attorney.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,15 @@ function applyConfig(config) {
}

function applyDatabaseConfig(config) {

if(typeof config === 'string' || (config.connectionString && typeof config.connectionString === 'string')) {
config = {connectionString: config.connectionString || config};
if(typeof config === 'string') {
return {
connectionString: config,
schema: 'pgboss',
poolSize: 10
};
}
else {

if (typeof (config.connectionString) !== 'string') {
assert(config.database && config.user && 'password' in config,
'configuration assert: not enough database settings to connect to PostgreSQL');

Expand Down
10 changes: 10 additions & 0 deletions test/configTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,14 @@ describe('initialization', function(){
});
});

it('should accept a connectionString and schema properties', function(finished){
const connectionString = 'postgresql://postgres@127.0.0.1:5432/db';
const schema = 'pgboss_custom_schema';
const boss = new PgBoss({connectionString, schema});

assert.equal(boss.config.schema, schema);

finished();
});

});

0 comments on commit 76e031b

Please sign in to comment.