From 9e0f94b573644b18783d3cf18f8fdff3a0108db1 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Tue, 4 Jun 2024 07:04:00 +0700 Subject: [PATCH] refactor: Make StorIO consistent with SQLDelight --- .../data/database/tables/HistoryTable.kt | 27 +++---------------- .../database/tables/SearchMetadataTable.kt | 18 ------------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/HistoryTable.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/HistoryTable.kt index 9d19544a49..25e9250273 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/HistoryTable.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/HistoryTable.kt @@ -10,40 +10,21 @@ object HistoryTable { /** * Id column name */ - const val COL_ID = "${TABLE}_id" + const val COL_ID = "history_id" /** * Chapter id column name */ - const val COL_CHAPTER_ID = "${TABLE}_chapter_id" + const val COL_CHAPTER_ID = "history_chapter_id" /** * Last read column name */ - const val COL_LAST_READ = "${TABLE}_last_read" + const val COL_LAST_READ = "history_last_read" /** * Time read column name */ - const val COL_TIME_READ = "${TABLE}_time_read" + const val COL_TIME_READ = "history_time_read" - /** - * query to create history table - */ - val createTableQuery: String - get() = - """CREATE TABLE $TABLE( - $COL_ID INTEGER NOT NULL PRIMARY KEY, - $COL_CHAPTER_ID INTEGER NOT NULL UNIQUE, - $COL_LAST_READ LONG, - $COL_TIME_READ LONG, - FOREIGN KEY($COL_CHAPTER_ID) REFERENCES ${ChapterTable.TABLE} (${ChapterTable.COL_ID}) - ON DELETE CASCADE - )""" - - /** - * query to index history chapter id - */ - val createChapterIdIndexQuery: String - get() = "CREATE INDEX ${TABLE}_${COL_CHAPTER_ID}_index ON $TABLE($COL_CHAPTER_ID)" } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/SearchMetadataTable.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/SearchMetadataTable.kt index 89f318c6dc..2c720a74b1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/SearchMetadataTable.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/SearchMetadataTable.kt @@ -13,22 +13,4 @@ object SearchMetadataTable { const val COL_EXTRA_VERSION = "extra_version" - // Insane foreign, primary key to avoid touch manga table - val createTableQuery: String - get() = - """CREATE TABLE $TABLE( - $COL_MANGA_ID INTEGER NOT NULL PRIMARY KEY, - $COL_UPLOADER TEXT, - $COL_EXTRA TEXT NOT NULL, - $COL_INDEXED_EXTRA TEXT, - $COL_EXTRA_VERSION INT NOT NULL, - FOREIGN KEY($COL_MANGA_ID) REFERENCES ${MangaTable.TABLE} (${MangaTable.COL_ID}) - ON DELETE CASCADE - )""" - - val createUploaderIndexQuery: String - get() = "CREATE INDEX ${TABLE}_${COL_UPLOADER}_index ON $TABLE($COL_UPLOADER)" - - val createIndexedExtraIndexQuery: String - get() = "CREATE INDEX ${TABLE}_${COL_INDEXED_EXTRA}_index ON $TABLE($COL_INDEXED_EXTRA)" }