liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: MSSQL - assetFolder getHierarchy query (#1131)

Browse Source
This commit is contained in:
apif 2019-10-26 00:29:28 +02:00 committed by Nicolas Giard
parent 44a1c8699f
commit 8badd8fd55
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/models/assetFolders.js
View File

@ -40,11 +40,21 @@ module.exports = class AssetFolder extends Model {
* @param {Number} folderId Id of the folder * @param {Number} folderId Id of the folder
*/ */
static async getHierarchy (folderId) { static async getHierarchy (folderId) {
const hier = await WIKI.models.knex.withRecursive('ancestors', qb => { let hier
if (WIKI.config.db.type === 'mssql') {
hier = await WIKI.models.knex.with('ancestors', qb => {
qb.select('id', 'name', 'slug', 'parentId').from('assetFolders').where('id', folderId).unionAll(sqb => {
sqb.select('a.id', 'a.name', 'a.slug', 'a.parentId').from('assetFolders AS a').join('ancestors', 'ancestors.parentId', 'a.id')
})
}).select('*').from('ancestors')
}
else {
hier = await WIKI.models.knex.withRecursive('ancestors', qb => {
qb.select('id', 'name', 'slug', 'parentId').from('assetFolders').where('id', folderId).union(sqb => { qb.select('id', 'name', 'slug', 'parentId').from('assetFolders').where('id', folderId).union(sqb => {
sqb.select('a.id', 'a.name', 'a.slug', 'a.parentId').from('assetFolders AS a').join('ancestors', 'ancestors.parentId', 'a.id') sqb.select('a.id', 'a.name', 'a.slug', 'a.parentId').from('assetFolders AS a').join('ancestors', 'ancestors.parentId', 'a.id')
}) })
}).select('*').from('ancestors') }).select('*').from('ancestors')
}
// The ancestors are from children to grandparents, must reverse for correct path order. // The ancestors are from children to grandparents, must reverse for correct path order.
return _.reverse(hier) return _.reverse(hier)
} }