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

Remove i_date query binding

Browse Source
This commit is contained in:
Eike Kettner 2020-06-06 15:15:29 +02:00
parent d5819eab35
commit 071ab60a5c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/store/src/main/scala/docspell/store/queries/QItem.scala
View File

@ -217,7 +217,7 @@ object QItem {
IC.id.prefix("i").f, IC.id.prefix("i").f,
IC.name.prefix("i").f, IC.name.prefix("i").f,
IC.state.prefix("i").f, IC.state.prefix("i").f,
coalesce(IC.itemDate.prefix("i").f, IC.created.prefix("i").f) ++ fr"i_date", coalesce(IC.itemDate.prefix("i").f, IC.created.prefix("i").f),
IC.dueDate.prefix("i").f, IC.dueDate.prefix("i").f,
IC.source.prefix("i").f, IC.source.prefix("i").f,
IC.incoming.prefix("i").f, IC.incoming.prefix("i").f,
@ -325,13 +325,15 @@ object QItem {
case Some(co) => case Some(co) =>
orderBy(coalesce(co(IC).prefix("i").f, IC.created.prefix("i").f) ++ fr"ASC") orderBy(coalesce(co(IC).prefix("i").f, IC.created.prefix("i").f) ++ fr"ASC")
case None => case None =>
orderBy(fr"i_date DESC") orderBy(
coalesce(IC.itemDate.prefix("i").f, IC.created.prefix("i").f) ++ fr"DESC"
)
} }
val frag = val frag =
query ++ fr"WHERE" ++ cond ++ order ++ (if (batch == Batch.all) Fragment.empty query ++ fr"WHERE" ++ cond ++ order ++ (if (batch == Batch.all) Fragment.empty
else else
fr"LIMIT ${batch.limit} OFFSET ${batch.offset}") fr"LIMIT ${batch.limit} OFFSET ${batch.offset}")
logger.trace(s"List items: $frag") logger.trace(s"List $batch items: $frag")
frag.query[ListItem].stream frag.query[ListItem].stream
} }