TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allo wildcards when searching by attachment ids

Browse Source
This commit is contained in:
eikek
2021-07-31 01:23:37 +02:00
parent 860e146bf0
commit 1256a6e8cf
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
View File

@ -171,12 +171,16 @@ object ItemQueryGenerator {
tables.item.id.in(select.withSelect(Nel.of(RItem.as("i").id.s)))
case Expr.AttachId(id) =>
tables.item.id.in(
Select(
select(RAttachment.T.itemId),
from(RAttachment.T),
val idWildcard = QueryWildcard(id)
val query =
if (id == idWildcard) {
RAttachment.T.id.cast[String] === id
).distinct
} else {
RAttachment.T.id.cast[String].like(idWildcard)
}
tables.item.id.in(
Select(select(RAttachment.T.itemId), from(RAttachment.T), query).distinct
)
case Expr.Fulltext(_) =>

28
modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala
View File

@ -11,6 +11,7 @@ import java.time.LocalDate
import docspell.common._
import docspell.query.ItemQueryParser
import docspell.store.qb.DSL._
import docspell.store.qb.Select
import docspell.store.qb.generator.{ItemQueryGenerator, Tables}
import docspell.store.queries.AttachCountTable
import docspell.store.records._
@ -56,4 +57,31 @@ class ItemQueryGeneratorTest extends FunSuite {
assertEquals(cond, expect)
}
test("attach.id with wildcard") {
val q = ItemQueryParser.parseUnsafe("attach.id=abcde*")
val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
val expect = tables.item.id.in(
Select(
select(RAttachment.T.itemId),
from(RAttachment.T),
RAttachment.T.id.cast[String].like("abcde%")
).distinct
)
assertEquals(cond, expect)
}
test("attach.id with equals") {
val q = ItemQueryParser.parseUnsafe("attach.id=abcde")
val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
val expect = tables.item.id.in(
Select(
select(RAttachment.T.itemId),
from(RAttachment.T),
RAttachment.T.id.cast[String] === "abcde"
).distinct
)
assertEquals(cond, expect)
}
}