Fix postgres db custom schema option not working

pull/6708/head
Irmo van den Berge 10 months ago
parent ef174143ae
commit a81f5c10c6

@ -187,11 +187,19 @@ module.exports = {
}
}
},
// -> Create DB Schema if different than the default 'public'
async createDefaultSchema () {
if (WIKI.config.db.schema && WIKI.config.db.schema !== 'public') {
await self.knex.raw(`CREATE SCHEMA IF NOT EXISTS ${WIKI.config.db.schema};`)
}
},
// -> Migrate DB Schemas
async syncSchemas () {
return self.knex.migrate.latest({
tableName: 'migrations',
migrationSource
migrationSource,
schemaName: (WIKI.config.db.schema && WIKI.config.db.schema !== 'public')
? WIKI.config.db.schema : undefined
})
},
// -> Migrate DB Schemas from beta
@ -202,6 +210,7 @@ module.exports = {
let initTasksQueue = (WIKI.IS_MASTER) ? [
initTasks.connect,
initTasks.createDefaultSchema,
initTasks.migrateFromBeta,
initTasks.syncSchemas
] : [

@ -84,6 +84,8 @@ module.exports = {
const baseMigrationPath = path.join(WIKI.SERVERPATH, (WIKI.config.db.type !== 'sqlite') ? 'db/beta/migrations' : 'db/beta/migrations-sqlite')
await knex.migrate.latest({
tableName: 'migrations',
schemaName: (WIKI.config.db.schema && WIKI.config.db.schema !== 'public')
? WIKI.config.db.schema : undefined,
migrationSource: {
async getMigrations() {
const migrationFiles = await fs.readdir(baseMigrationPath)

Loading…
Cancel
Save