Browse Source

feat: add possibility to set PostgreSQL schema other than public (#4161)

pull/4490/head 2.5.219
Frederic Alix 3 years ago
committed by GitHub
parent
commit
8d1f752620
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
  1. 3
      config.sample.yml
  2. 4
      server/core/db.js

3
config.sample.yml

@ -43,6 +43,9 @@ db:
# pfx: path/to/cert.pfx # pfx: path/to/cert.pfx
# passphrase: xyz123 # passphrase: xyz123
# Optional - PostgreSQL only:
schema: public
# SQLite only: # SQLite only:
storage: path/to/database.sqlite storage: path/to/database.sqlite

4
server/core/db.js

@ -138,6 +138,10 @@ module.exports = {
switch (WIKI.config.db.type) { switch (WIKI.config.db.type) {
case 'postgres': case 'postgres':
await conn.query(`set application_name = 'Wiki.js'`) await conn.query(`set application_name = 'Wiki.js'`)
// -> Set schema if it's not public
if (WIKI.config.db.schema && WIKI.config.db.schema !== 'public') {
await conn.query(`set search_path TO ${WIKI.config.db.schema}, public;`)
}
done() done()
break break
case 'mysql': case 'mysql':

Loading…
Cancel
Save