From 0461cfefe73d54f4c956ae006424467b78cd8661 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Wed, 28 Oct 2020 22:51:43 +0100
Subject: [PATCH 1/2] 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 =
From f58245bce65e34a9dcd329182bdda4ee612afddb Mon Sep 17 00:00:00 2001
From: Scala Steward <me@scala-steward.org>
Date: Thu, 29 Oct 2020 04:34:46 +0100
Subject: [PATCH 2/2] Update icu4j to 68.1
---
project/Dependencies.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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"