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

Merge branch 'master' of github.com:eikek/docspell into pr-consumedir_clean

Browse Source
This commit is contained in:
Malte 2020-10-29 06:18:49 +01:00
commit 8e934247b3
2 changed files with 3 additions and 6 deletions
Show Stats 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 val EC = REquipment.Columns
// inclusive tags are AND-ed // inclusive tags are AND-ed
val tagSelectsIncl = (q.tagsInclude val tagSelectsIncl = q.tagsInclude
.map(tid => .map(tid =>
selectSimple( selectSimple(
List(RTagItem.Columns.itemId), List(RTagItem.Columns.itemId),
RTagItem.table, RTagItem.table,
RTagItem.Columns.tagId.is(tid) RTagItem.Columns.tagId.is(tid)
) )
) ++ q.tagCategoryIncl.map(cat => ) ++ q.tagCategoryIncl.map(cat => TagItemName.itemsInCategory(NonEmptyList.of(cat)))
TagItemName.itemsInCategory(NonEmptyList.of(cat))
))
.map(f => sql"(" ++ f ++ sql") ")
// exclusive tags are OR-ed // exclusive tags are OR-ed
val tagSelectsExcl = val tagSelectsExcl =

2
project/Dependencies.scala
View File

@ -18,7 +18,7 @@ object Dependencies {
val Fs2Version = "2.4.4" val Fs2Version = "2.4.4"
val H2Version = "1.4.200" val H2Version = "1.4.200"
val Http4sVersion = "0.21.8" val Http4sVersion = "0.21.8"
val Icu4jVersion = "67.1" val Icu4jVersion = "68.1"
val JsoupVersion = "1.13.1" val JsoupVersion = "1.13.1"
val KindProjectorVersion = "0.10.3" val KindProjectorVersion = "0.10.3"
val Log4sVersion = "1.8.2" val Log4sVersion = "1.8.2"