TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 19:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #754 from eikek/query-fix

Browse Source 
Reduce not expressions
This commit is contained in:
eikek 2021-04-11 13:08:59 +02:00 committed by GitHub
commit d8a56d7482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/query/shared/src/main/scala/docspell/query/internal/ExprUtil.scala
View File

@ -31,7 +31,7 @@ object ExprUtil {
case DirectionExpr(flag) => case DirectionExpr(flag) =>
DirectionExpr(!flag) DirectionExpr(!flag)
case _ => case _ =>
expr NotExpr(reduce(inner))
} }
case m: MacroExpr => case m: MacroExpr =>

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

@ -43,4 +43,11 @@ class ItemQueryGeneratorTest extends FunSuite {
assertEquals(cond, expect) assertEquals(cond, expect)
} }
test("!conc:*") {
val q = ItemQueryParser.parseUnsafe("!conc:*")
val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
val expect = not(tables.concPers.name.like("%") || tables.concEquip.name.like("%"))
assertEquals(cond, expect)
}
} }