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 = diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 820b2287..353a2ab1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -18,7 +18,7 @@ object Dependencies { val Fs2Version = "2.4.4" val H2Version = "1.4.200" val Http4sVersion = "0.21.8" - val Icu4jVersion = "67.1" + val Icu4jVersion = "68.1" val JsoupVersion = "1.13.1" val KindProjectorVersion = "0.10.3" val Log4sVersion = "1.8.2"