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

Add counter to joblog for correct log order

Browse Source 
This is to distinguish log entries created at the same time.
This commit is contained in:
Eike Kettner
2020-10-02 21:59:37 +02:00
parent bcf86d97f5
commit 80ddca9aa3
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/store/src/main/resources/db/migration/h2/V1.9.3__joblog_counter.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE "joblog"
ADD COLUMN "counter" bigint auto_increment;

2
modules/store/src/main/resources/db/migration/mariadb/V1.9.3__joblog_counter.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `joblog`
ADD COLUMN `counter` mediumint auto_increment unique;

2
modules/store/src/main/resources/db/migration/postgresql/V1.9.3__joblog_counter.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE "joblog"
ADD COLUMN "counter" bigserial;

6
modules/store/src/main/scala/docspell/store/records/RJobLog.scala
View File

@ -26,6 +26,10 @@ object RJobLog {
val created = Column("created")
val message = Column("message")
val all = List(id, jobId, level, created, message)
// separate column only for sorting, so not included in `all` and
// the case class
val counter = Column("counter")
}
import Columns._
@ -37,7 +41,7 @@ object RJobLog {
).update.run
def findLogs(id: Ident): ConnectionIO[Vector[RJobLog]] =
(selectSimple(all, table, jobId.is(id)) ++ orderBy(created.asc))
(selectSimple(all, table, jobId.is(id)) ++ orderBy(created.asc, counter.asc))
.query[RJobLog]
.to[Vector]