Skip to content

support pg-promise init options #3613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 7, 2017
Merged

support pg-promise init options #3613

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8509f1c
pg-promise init options
rendongsc Mar 9, 2017
5f725dc
add database init options
rendongsc Mar 14, 2017
23ca566
Create PostgresInitOptions.spec.js
rendongsc Mar 24, 2017
d8af3f8
Update PostgresInitOptions.spec.js
rendongsc Mar 24, 2017
a2fcadb
Update PostgresInitOptions.spec.js
rendongsc Mar 24, 2017
82136b3
add PostgresInitOptions test
rendongsc Mar 24, 2017
c81bd17
Add files via upload
rendongsc Mar 24, 2017
6bd4de5
'linter
rendongsc Mar 26, 2017
9f46de8
linebreaks CRLF to LF
rendongsc Mar 26, 2017
139dee4
modify postgresURI to test environment
rendongsc Mar 27, 2017
5509f10
modify pg error code to 42P01
rendongsc Mar 27, 2017
6b68341
fix reconfigureServer callback
rendongsc Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Adapters/Storage/Postgres/PostgresClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ export function createClient(uri, databaseOptions) {
dbOptions = parser.getDatabaseOptionsFromURI(uri);
}

let pgp = require('pg-promise')(databaseOptions);
for (const key in databaseOptions) {
dbOptions[key] = databaseOptions[key];
}

const initOptions = dbOptions.initOptions || {};
const pgp = require('pg-promise')(initOptions);
const client = pgp(dbOptions);

if (dbOptions.pgOptions) {
for (const key in dbOptions.pgOptions) {
client.pg.defaults[key] = dbOptions.pgOptions[key];
pgp.pg.defaults[key] = dbOptions.pgOptions[key];
}
}

Expand Down