TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 09:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #405 from eikek/fix-mariadb-sql

Browse Source 
Fix sql error for mariadb <10.4
This commit is contained in:
mergify[bot]
2020-10-28 23:42:07 +00:00
committed by GitHub
parent 509823404e 0461cfefe7
commit a2ce94b5d5
1 changed files with 2 additions and 5 deletions
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
// inclusive tags are AND-ed
val tagSelectsIncl = (q.tagsInclude
val tagSelectsIncl = q.tagsInclude
.map(tid =>
selectSimple(
List(RTagItem.Columns.itemId),
RTagItem.table,
RTagItem.Columns.tagId.is(tid)
)
) ++ q.tagCategoryIncl.map(cat =>
TagItemName.itemsInCategory(NonEmptyList.of(cat))
))
.map(f => sql"(" ++ f ++ sql") ")
) ++ q.tagCategoryIncl.map(cat => TagItemName.itemsInCategory(NonEmptyList.of(cat)))
// exclusive tags are OR-ed
val tagSelectsExcl =