mirror of
https://github.com/TheAnachronism/docspell.git
synced 2025-06-01 04:52:52 +00:00
Merge pull request #405 from eikek/fix-mariadb-sql
Fix sql error for mariadb <10.4
This commit is contained in:
commit
a2ce94b5d5
@ -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 =
|
||||
|
Loading…
x
Reference in New Issue
Block a user