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 #852 from eikek/fix/849-search-case

Browse Source 
Fix tag category search being case insensitive
This commit is contained in:
mergify[bot] 2021-06-03 19:57:44 +00:00 committed by GitHub
commit 7e4e72588b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/store/src/main/scala/docspell/store/qb/DSL.scala
View File

@ -147,6 +147,15 @@ trait DSL extends DoobieMeta {
if (cs.isEmpty) c if (cs.isEmpty) c
else and(c, cs: _*) else and(c, cs: _*)
implicit final class StringColumnOps(col: Column[String]) {
def lowerEq(value: String): Condition =
Condition.CompareVal(col, Operator.LowerEq, value.toLowerCase)
def like(value: String): Condition =
Condition.CompareVal(col, Operator.LowerLike, value.toLowerCase)
}
implicit final class ColumnOps[A](col: Column[A]) { implicit final class ColumnOps[A](col: Column[A]) {
def s: SelectExpr = def s: SelectExpr =
SelectExpr.SelectColumn(col, None) SelectExpr.SelectColumn(col, None)
@ -176,13 +185,13 @@ trait DSL extends DoobieMeta {
def ===(value: A)(implicit P: Put[A]): Condition = def ===(value: A)(implicit P: Put[A]): Condition =
Condition.CompareVal(col, Operator.Eq, value) Condition.CompareVal(col, Operator.Eq, value)
def lowerEq(value: A)(implicit P: Put[A]): Condition = def lowerEqA(value: A)(implicit P: Put[A]): Condition =
Condition.CompareVal(col, Operator.LowerEq, value) Condition.CompareVal(col, Operator.LowerEq, value)
def ====(value: String): Condition = def ====(value: String): Condition =
Condition.CompareVal(col.cast[String], Operator.Eq, value) Condition.CompareVal(col.cast[String], Operator.Eq, value)
def like(value: A)(implicit P: Put[A]): Condition = def likeA(value: A)(implicit P: Put[A]): Condition =
Condition.CompareVal(col, Operator.LowerLike, value) Condition.CompareVal(col, Operator.LowerLike, value)
def likes(value: String): Condition = def likes(value: String): Condition =
@ -215,10 +224,16 @@ trait DSL extends DoobieMeta {
def notIn(values: Nel[A])(implicit P: Put[A]): Condition = def notIn(values: Nel[A])(implicit P: Put[A]): Condition =
in(values).negate in(values).negate
def inLower(values: Nel[A])(implicit P: Put[A]): Condition = def inLower(values: Nel[String]): Condition =
Condition.InValues(col.s, values.map(_.toLowerCase), true)
def inLowerA(values: Nel[A])(implicit P: Put[A]): Condition =
Condition.InValues(col.s, values, true) Condition.InValues(col.s, values, true)
def notInLower(values: Nel[A])(implicit P: Put[A]): Condition = def notInLower(values: Nel[String]): Condition =
Condition.InValues(col.s, values.map(_.toLowerCase), true).negate
def notInLowerA(values: Nel[A])(implicit P: Put[A]): Condition =
Condition.InValues(col.s, values, true).negate Condition.InValues(col.s, values, true).negate
def isNull: Condition = def isNull: Condition =