From 9a817e49bed34e11e6b24b48d738d14583440fae Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 10 Jul 2023 16:44:48 -0400 Subject: [PATCH] Set proper defaults for new table columns --- app/build.gradle.kts | 3 +-- .../eu/kanade/tachiyomi/data/backup/models/BackupManga.kt | 2 +- data/src/main/sqldelight/tachiyomi/migrations/25.sqm | 6 +++--- domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e08346259..74477e52f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,9 +22,8 @@ android { defaultConfig { applicationId = "eu.kanade.tachiyomi" - + versionCode = 104 - versionName = "0.14.6" buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt index cbca81f49..a3d0f4493 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt @@ -40,7 +40,7 @@ data class BackupManga( @ProtoNumber(104) var history: List = emptyList(), @ProtoNumber(105) var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE, @ProtoNumber(106) var lastModifiedAt: Long = 0, - @ProtoNumber(107) var favoriteModifiedAt: Long? = 0, + @ProtoNumber(107) var favoriteModifiedAt: Long? = null, ) { fun getMangaImpl(): Manga { return Manga.create().copy( diff --git a/data/src/main/sqldelight/tachiyomi/migrations/25.sqm b/data/src/main/sqldelight/tachiyomi/migrations/25.sqm index b4d98546a..0cd1c4c07 100644 --- a/data/src/main/sqldelight/tachiyomi/migrations/25.sqm +++ b/data/src/main/sqldelight/tachiyomi/migrations/25.sqm @@ -1,7 +1,7 @@ -ALTER TABLE mangas ADD COLUMN last_modified_at INTEGER AS Long NOT NULL; +ALTER TABLE mangas ADD COLUMN last_modified_at INTEGER AS Long NOT NULL DEFAULT 0; ALTER TABLE mangas ADD COLUMN favorite_modified_at INTEGER AS Long; -ALTER TABLE mangas_categories ADD COLUMN last_modified_at INTEGER AS Long NOT NULL; -ALTER TABLE chapters ADD COLUMN last_modified_at INTEGER AS Long NOT NULL; +ALTER TABLE mangas_categories ADD COLUMN last_modified_at INTEGER AS Long NOT NULL DEFAULT 0; +ALTER TABLE chapters ADD COLUMN last_modified_at INTEGER AS Long NOT NULL DEFAULT 0; UPDATE mangas SET last_modified_at = strftime('%s', 'now'); UPDATE mangas SET favorite_modified_at = strftime('%s', 'now') WHERE favorite = 1; diff --git a/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt b/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt index 6d53afa6a..22e953b58 100644 --- a/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt @@ -112,7 +112,7 @@ data class Manga( updateStrategy = UpdateStrategy.ALWAYS_UPDATE, initialized = false, lastModifiedAt = 0L, - favoriteModifiedAt = 0L, + favoriteModifiedAt = null, ) } }