diff options
| author | Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> | 2019-05-24 03:26:56 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-05-24 03:26:56 +0900 |
| commit | 6de08d07a3d5cc4db2c9900f59a66ccca8643918 (patch) | |
| tree | 353ffbed5d87cbb1c4635e43061781dd20f49e8d /src | |
| parent | Merge branch 'develop' of https://github.com/syuilo/misskey into develop (diff) | |
| download | sharkey-6de08d07a3d5cc4db2c9900f59a66ccca8643918.tar.gz sharkey-6de08d07a3d5cc4db2c9900f59a66ccca8643918.tar.bz2 sharkey-6de08d07a3d5cc4db2c9900f59a66ccca8643918.zip | |
Support PostgreSQL Extra Connection options (#4970)
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/types.ts | 1 | ||||
| -rw-r--r-- | src/db/postgre.ts | 1 | ||||
| -rw-r--r-- | src/ormconfig.ts | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/config/types.ts b/src/config/types.ts index 7da9820f22..c35bc63573 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -14,6 +14,7 @@ export type Source = { db: string; user: string; pass: string; + extra?: { [x: string]: string }; }; redis: { host: string; diff --git a/src/db/postgre.ts b/src/db/postgre.ts index fcec68602f..04893efe2c 100644 --- a/src/db/postgre.ts +++ b/src/db/postgre.ts @@ -93,6 +93,7 @@ export function initDb(justBorrow = false, sync = false, log = false) { username: config.db.user, password: config.db.pass, database: config.db.db, + extra: config.db.extra, synchronize: process.env.NODE_ENV === 'test' || sync, dropSchema: process.env.NODE_ENV === 'test' && !justBorrow, logging: log, diff --git a/src/ormconfig.ts b/src/ormconfig.ts index 91f33181f4..6b7297b2c3 100644 --- a/src/ormconfig.ts +++ b/src/ormconfig.ts @@ -8,6 +8,7 @@ const json = { username: config.db.user, password: config.db.pass, database: config.db.db, + extra: config.db.extra, entities: ['src/models/entities/*.ts'], migrations: ['migration/*.ts'], cli: { |