TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sql error for mariadb <10.4

Browse Source 
MariaDB below 10.4 doesn't support parentheses around selects for
`intersect` and `union`.

https://mariadb.com/kb/en/intersect/#parentheses

Fixes #404
This commit is contained in:
Eike Kettner 2020-10-28 22:51:43 +01:00
parent 509823404e
commit 0461cfefe7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/store/src/main/scala/docspell/store/queries/QItem.scala
View File

@ -328,17 +328,14 @@ object QItem {
val EC = REquipment.Columns val EC = REquipment.Columns
// inclusive tags are AND-ed // inclusive tags are AND-ed
val tagSelectsIncl = (q.tagsInclude val tagSelectsIncl = q.tagsInclude
.map(tid => .map(tid =>
selectSimple( selectSimple(
List(RTagItem.Columns.itemId), List(RTagItem.Columns.itemId),
RTagItem.table, RTagItem.table,
RTagItem.Columns.tagId.is(tid) RTagItem.Columns.tagId.is(tid)
) )
) ++ q.tagCategoryIncl.map(cat => ) ++ q.tagCategoryIncl.map(cat => TagItemName.itemsInCategory(NonEmptyList.of(cat)))
TagItemName.itemsInCategory(NonEmptyList.of(cat))
))
.map(f => sql"(" ++ f ++ sql") ")
// exclusive tags are OR-ed // exclusive tags are OR-ed
val tagSelectsExcl = val tagSelectsExcl =