From 0461cfefe73d54f4c956ae006424467b78cd8661 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Wed, 28 Oct 2020 22:51:43 +0100 Subject: [PATCH] Fix sql error for mariadb <10.4 MariaDB below 10.4 doesn't support parentheses around selects for `intersect` and `union`. https://mariadb.com/kb/en/intersect/#parentheses Fixes #404 --- .../src/main/scala/docspell/store/queries/QItem.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/store/src/main/scala/docspell/store/queries/QItem.scala b/modules/store/src/main/scala/docspell/store/queries/QItem.scala index a5311500..bce5f836 100644 --- a/modules/store/src/main/scala/docspell/store/queries/QItem.scala +++ b/modules/store/src/main/scala/docspell/store/queries/QItem.scala @@ -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 =