Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-01 11:25:24 +02:00
Code Issues Projects Releases Wiki Activity

build: upgrade jooq version to 3.14.8

Browse source
This commit is contained in:
Gauthier Roebroeck 2021-03-15 15:12:11 +08:00
parent e284cc457e
commit 4bb0eda34a
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
komga/build.gradle.kts
View file

@ -223,7 +223,7 @@ tasks.flywayMigrate {
}
jooq {
version.set("3.13.1")
version.set("3.14.8")
configurations {
create("main") {
jooqConfiguration.apply {

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDao.kt
View file

@ -69,7 +69,7 @@ class BookDao(
.leftJoin(d).on(b.ID.eq(d.BOOK_ID))
.leftJoin(m).on(b.ID.eq(m.BOOK_ID))
.where(conditions)
.fetchOne(0, Long::class.java)
.fetchOne(0, Long::class.java) ?: 0
val orderBy = pageable.sort.toOrderBy(sorts)
@ -88,7 +88,7 @@ class BookDao(
items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
else PageRequest.of(0, maxOf(count.toInt(), 20), pageSort),
count.toLong()
count
)
}

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/BookDtoDao.kt
View file

@ -186,7 +186,7 @@ class BookDtoDao(
.from(b)
.leftJoin(d).on(b.ID.eq(d.BOOK_ID))
.where(b.ID.eq(bookId))
.fetchOne()
.fetchOne()!!
val seriesId = record.get(0, String::class.java)
val numberSort = record.get(1, Float::class.java)

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/LibraryDao.kt
View file

@ -23,7 +23,7 @@ class LibraryDao(
?.toDomain()
override fun findById(libraryId: String): Library =
findOne(libraryId)
findOne(libraryId)!!
.toDomain()
private fun findOne(libraryId: String) =

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReadListDao.kt
View file

@ -51,7 +51,7 @@ class ReadListDao(
val count = dsl.selectCount()
.from(rl)
.where(conditions)
.fetchOne(0, Long::class.java)
.fetchOne(0, Long::class.java) ?: 0
val orderBy = pageable.sort.toOrderBy(sorts)
@ -66,7 +66,7 @@ class ReadListDao(
items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
else PageRequest.of(0, maxOf(count.toInt(), 20), pageSort),
count.toLong()
count
)
}

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesCollectionDao.kt
View file

@ -50,7 +50,7 @@ class SeriesCollectionDao(
val count = dsl.selectCount()
.from(c)
.where(conditions)
.fetchOne(0, Long::class.java)
.fetchOne(0, Long::class.java) ?: 0
val orderBy = pageable.sort.toOrderBy(sorts)
@ -65,7 +65,7 @@ class SeriesCollectionDao(
items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
else PageRequest.of(0, maxOf(count.toInt(), 20), pageSort),
count.toLong()
count
)
}

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesMetadataDao.kt
View file

@ -19,7 +19,7 @@ class SeriesMetadataDao(
private val st = Tables.SERIES_METADATA_TAG
override fun findById(seriesId: String): SeriesMetadata =
findOne(seriesId).toDomain(findGenres(seriesId), findTags(seriesId))
findOne(seriesId)!!.toDomain(findGenres(seriesId), findTags(seriesId))
override fun findByIdOrNull(seriesId: String): SeriesMetadata? =
findOne(seriesId)?.toDomain(findGenres(seriesId), findTags(seriesId))