Support PostgreSQL Extra Connection options (#4970)

This commit is contained in:
Satsuki Yanagi 2019-05-24 03:26:56 +09:00 committed by syuilo
parent f54cd10a04
commit 6de08d07a3
4 changed files with 7 additions and 0 deletions

View file

@ -62,6 +62,10 @@ db:
user: example-misskey-user user: example-misskey-user
pass: example-misskey-pass pass: example-misskey-pass
# Extra Connection options
#extra:
# ssl: true
# ┌─────────────────────┐ # ┌─────────────────────┐
#───┘ Redis configuration └───────────────────────────────────── #───┘ Redis configuration └─────────────────────────────────────

View file

@ -14,6 +14,7 @@ export type Source = {
db: string; db: string;
user: string; user: string;
pass: string; pass: string;
extra?: { [x: string]: string };
}; };
redis: { redis: {
host: string; host: string;

View file

@ -93,6 +93,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
username: config.db.user, username: config.db.user,
password: config.db.pass, password: config.db.pass,
database: config.db.db, database: config.db.db,
extra: config.db.extra,
synchronize: process.env.NODE_ENV === 'test' || sync, synchronize: process.env.NODE_ENV === 'test' || sync,
dropSchema: process.env.NODE_ENV === 'test' && !justBorrow, dropSchema: process.env.NODE_ENV === 'test' && !justBorrow,
logging: log, logging: log,

View file

@ -8,6 +8,7 @@ const json = {
username: config.db.user, username: config.db.user,
password: config.db.pass, password: config.db.pass,
database: config.db.db, database: config.db.db,
extra: config.db.extra,
entities: ['src/models/entities/*.ts'], entities: ['src/models/entities/*.ts'],
migrations: ['migration/*.ts'], migrations: ['migration/*.ts'],
cli: { cli: {