Revert "Revert history Compose/SQLDelight changes"

This reverts commit 6a0b523e86.

app/src/main/java/exh/EXHMigrations.kt

@@ -6,6 +6,7 @@ import androidx.preference.PreferenceManager
 import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
 import com.pushtorefresh.storio.sqlite.queries.Query
 import com.pushtorefresh.storio.sqlite.queries.RawQuery
+import eu.kanade.data.DatabaseHandler
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
@@ -40,8 +41,6 @@ import exh.eh.EHentaiUpdateWorker
 import exh.log.xLogE
 import exh.log.xLogW
 import exh.merged.sql.models.MergedMangaReference
-import exh.savedsearches.models.FeedSavedSearch
-import exh.savedsearches.models.SavedSearch
 import exh.source.BlacklistedSources
 import exh.source.EH_SOURCE_ID
 import exh.source.HBROWSE_SOURCE_ID
@@ -51,6 +50,7 @@ import exh.source.PERV_EDEN_IT_SOURCE_ID
 import exh.source.TSUMINO_SOURCE_ID
 import exh.util.nullIfBlank
 import exh.util.under
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
@@ -69,6 +69,7 @@ import java.net.URISyntaxException
 
 object EXHMigrations {
     private val db: DatabaseHelper by injectLazy()
+    private val database: DatabaseHandler by injectLazy()
     private val sourceManager: SourceManager by injectLazy()
 
     /**
@@ -404,31 +405,31 @@ object EXHMigrations {
                     BackupCreatorJob.setupTask(context)
                 }
                 if (oldVersion under 31) {
-                    val savedSearches = prefs.getStringSet("eh_saved_searches", emptySet())?.mapNotNull {
-                        kotlin.runCatching {
-                            val content = Json.decodeFromString<JsonObject>(it.substringAfter(':'))
-                            SavedSearch(
-                                id = null,
-                                source = it.substringBefore(':').toLongOrNull() ?: return@mapNotNull null,
-                                content["name"]!!.jsonPrimitive.content,
-                                content["query"]!!.jsonPrimitive.contentOrNull?.nullIfBlank(),
-                                Json.encodeToString(content["filters"]!!.jsonArray),
-                            )
-                        }.getOrNull()
-                    }?.ifEmpty { null }
-                    if (savedSearches != null) {
-                        db.insertSavedSearches(savedSearches).executeAsBlocking()
-                    }
-                    val feed = prefs.getStringSet("latest_tab_sources", emptySet())?.map {
-                        FeedSavedSearch(
-                            id = null,
-                            source = it.toLong(),
-                            savedSearch = null,
-                            global = true,
-                        )
-                    }?.ifEmpty { null }
-                    if (feed != null) {
-                        db.insertFeedSavedSearches(feed).executeAsBlocking()
+                    runBlocking {
+                        database.await(true) {
+                            prefs.getStringSet("eh_saved_searches", emptySet())?.forEach {
+                                kotlin.runCatching {
+                                    val content = Json.decodeFromString<JsonObject>(it.substringAfter(':'))
+                                    saved_searchQueries.insertSavedSearch(
+                                        _id = null,
+                                        source = it.substringBefore(':').toLongOrNull() ?: return@forEach,
+                                        name = content["name"]!!.jsonPrimitive.content,
+                                        query = content["query"]!!.jsonPrimitive.contentOrNull?.nullIfBlank(),
+                                        filters_json = Json.encodeToString(content["filters"]!!.jsonArray)
+                                    )
+                                }
+                            }
+                        }
+                        database.await(true) {
+                            prefs.getStringSet("latest_tab_sources", emptySet())?.forEach {
+                                feed_saved_searchQueries.insertFeedSavedSearch(
+                                    _id = null,
+                                    source = it.toLong(),
+                                    saved_search = null,
+                                    global = true,
+                                )
+                            }
+                        }
                     }
                     prefs.edit(commit = true) {
                         remove("eh_saved_searches")

app/src/main/java/exh/debug/DebugFunctions.kt

@@ -3,6 +3,7 @@ package exh.debug
 import android.app.Application
 import androidx.work.WorkManager
 import com.pushtorefresh.storio.sqlite.queries.RawQuery
+import eu.kanade.data.DatabaseHandler
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.toMangaInfo
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
@@ -34,6 +35,7 @@ import java.util.UUID
 object DebugFunctions {
     val app: Application by injectLazy()
     val db: DatabaseHelper by injectLazy()
+    val database: DatabaseHandler by injectLazy()
     val prefs: PreferencesHelper by injectLazy()
     val sourceManager: SourceManager by injectLazy()
 
@@ -164,7 +166,7 @@ object DebugFunctions {
         it.favorite && db.getSearchMetadataForManga(it.id!!).executeAsBlocking() == null
     }
 
-    fun clearSavedSearches() = db.deleteAllSavedSearches().executeAsBlocking()
+    fun clearSavedSearches() = runBlocking { database.await { saved_searchQueries.deleteAll() } }
 
     fun listAllSources() = sourceManager.getCatalogueSources().joinToString("\n") {
         "${it.id}: ${it.name} (${it.lang.uppercase()})"

app/src/main/java/exh/favorites/sql/tables/FavoriteEntryTable.kt

@@ -13,20 +13,4 @@ object FavoriteEntryTable {
     const val COL_TOKEN = "token"
 
     const val COL_CATEGORY = "category"
-
-    val createTableQuery: String
-        get() =
-            """CREATE TABLE $TABLE(
-            $COL_ID INTEGER NOT NULL PRIMARY KEY,
-            $COL_TITLE TEXT NOT NULL,
-            $COL_GID TEXT NOT NULL,
-            $COL_TOKEN TEXT NOT NULL,
-            $COL_CATEGORY INTEGER NOT NULL
-            )"""
-
-    val fixTableQuery: String
-        get() = createTableQuery.replace(
-            "CREATE TABLE",
-            "CREATE TABLE IF NOT EXISTS",
-        )
 }

app/src/main/java/exh/merged/sql/tables/MergedTable.kt

@@ -1,7 +1,5 @@
 package exh.merged.sql.tables
 
-import eu.kanade.tachiyomi.data.database.tables.MangaTable
-
 object MergedTable {
 
     const val TABLE = "merged"
@@ -27,30 +25,4 @@ object MergedTable {
     const val COL_MANGA_URL = "manga_url"
 
     const val COL_MANGA_SOURCE = "manga_source"
-
-    val createTableQuery: String
-        get() =
-            """CREATE TABLE $TABLE(
-            $COL_ID INTEGER NOT NULL PRIMARY KEY,
-            $COL_IS_INFO_MANGA BOOLEAN NOT NULL,
-            $COL_GET_CHAPTER_UPDATES BOOLEAN NOT NULL,
-            $COL_CHAPTER_SORT_MODE INTEGER NOT NULL,
-            $COL_CHAPTER_PRIORITY INTEGER NOT NULL,
-            $COL_DOWNLOAD_CHAPTERS BOOLEAN NOT NULL,
-            $COL_MERGE_ID INTEGER NOT NULL,
-            $COL_MERGE_URL TEXT NOT NULL,
-            $COL_MANGA_ID INTEGER,
-            $COL_MANGA_URL TEXT NOT NULL,
-            $COL_MANGA_SOURCE INTEGER NOT NULL,
-            FOREIGN KEY($COL_MANGA_ID) REFERENCES ${MangaTable.TABLE} (${MangaTable.COL_ID})
-            ON DELETE SET NULL,
-            FOREIGN KEY($COL_MERGE_ID) REFERENCES ${MangaTable.TABLE} (${MangaTable.COL_ID})
-            ON DELETE CASCADE
-            )"""
-
-    val dropTableQuery: String
-        get() = "DROP TABLE $TABLE"
-
-    val createIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_MERGE_ID}_index ON $TABLE($COL_MERGE_ID)"
 }

app/src/main/java/exh/metadata/sql/tables/SearchMetadataTable.kt

@@ -1,7 +1,5 @@
 package exh.metadata.sql.tables
 
-import eu.kanade.tachiyomi.data.database.tables.MangaTable
-
 object SearchMetadataTable {
     const val TABLE = "search_metadata"
 
@@ -14,23 +12,4 @@ object SearchMetadataTable {
     const val COL_INDEXED_EXTRA = "indexed_extra"
 
     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)"
 }

app/src/main/java/exh/metadata/sql/tables/SearchTagTable.kt

@@ -1,7 +1,5 @@
 package exh.metadata.sql.tables
 
-import eu.kanade.tachiyomi.data.database.tables.MangaTable
-
 object SearchTagTable {
     const val TABLE = "search_tags"
 
@@ -14,22 +12,4 @@ object SearchTagTable {
     const val COL_NAME = "name"
 
     const val COL_TYPE = "type"
-
-    val createTableQuery: String
-        get() =
-            """CREATE TABLE $TABLE(
-            $COL_ID INTEGER NOT NULL PRIMARY KEY,
-            $COL_MANGA_ID INTEGER NOT NULL,
-            $COL_NAMESPACE TEXT,
-            $COL_NAME TEXT NOT NULL,
-            $COL_TYPE INT NOT NULL,
-            FOREIGN KEY($COL_MANGA_ID) REFERENCES ${MangaTable.TABLE} (${MangaTable.COL_ID})
-            ON DELETE CASCADE
-            )"""
-
-    val createMangaIdIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_MANGA_ID}_index ON $TABLE($COL_MANGA_ID)"
-
-    val createNamespaceNameIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_NAMESPACE}_${COL_NAME}_index ON $TABLE($COL_NAMESPACE, $COL_NAME)"
 }

app/src/main/java/exh/metadata/sql/tables/SearchTitleTable.kt

@@ -1,7 +1,5 @@
 package exh.metadata.sql.tables
 
-import eu.kanade.tachiyomi.data.database.tables.MangaTable
-
 object SearchTitleTable {
     const val TABLE = "search_titles"
 
@@ -12,21 +10,4 @@ object SearchTitleTable {
     const val COL_TITLE = "title"
 
     const val COL_TYPE = "type"
-
-    val createTableQuery: String
-        get() =
-            """CREATE TABLE $TABLE(
-            $COL_ID INTEGER NOT NULL PRIMARY KEY,
-            $COL_MANGA_ID INTEGER NOT NULL,
-            $COL_TITLE TEXT NOT NULL,
-            $COL_TYPE INT NOT NULL,
-            FOREIGN KEY($COL_MANGA_ID) REFERENCES ${MangaTable.TABLE} (${MangaTable.COL_ID})
-            ON DELETE CASCADE
-            )"""
-
-    val createMangaIdIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_MANGA_ID}_index ON $TABLE($COL_MANGA_ID)"
-
-    val createTitleIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_TITLE}_index ON $TABLE($COL_TITLE)"
 }

app/src/main/java/exh/savedsearches/queries/FeedSavedSearchQueries.kt

@@ -1,86 +1,5 @@
 package exh.savedsearches.queries
 
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.Query
-import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.data.database.DbProvider
-import eu.kanade.tachiyomi.data.database.queries.getGlobalFeedSavedSearchQuery
-import eu.kanade.tachiyomi.data.database.queries.getSourceFeedSavedSearchQuery
-import exh.savedsearches.models.FeedSavedSearch
-import exh.savedsearches.models.SavedSearch
-import exh.savedsearches.tables.FeedSavedSearchTable
 
-interface FeedSavedSearchQueries : DbProvider {
-    fun getGlobalFeedSavedSearches() = db.get()
-        .listOfObjects(FeedSavedSearch::class.java)
-        .withQuery(
-            Query.builder()
-                .table(FeedSavedSearchTable.TABLE)
-                .where("${FeedSavedSearchTable.COL_GLOBAL} = 1")
-                .orderBy(FeedSavedSearchTable.COL_ID)
-                .build(),
-        )
-        .prepare()
-
-    fun getSourceFeedSavedSearches(sourceId: Long) = db.get()
-        .listOfObjects(FeedSavedSearch::class.java)
-        .withQuery(
-            Query.builder()
-                .table(FeedSavedSearchTable.TABLE)
-                .where("${FeedSavedSearchTable.COL_SOURCE} = ? AND ${FeedSavedSearchTable.COL_GLOBAL} = 0")
-                .whereArgs(sourceId)
-                .orderBy(FeedSavedSearchTable.COL_ID)
-                .build(),
-        )
-        .prepare()
-
-    fun insertFeedSavedSearch(savedSearch: FeedSavedSearch) = db.put().`object`(savedSearch).prepare()
-
-    fun insertFeedSavedSearches(savedSearches: List<FeedSavedSearch>) = db.put().objects(savedSearches).prepare()
-
-    fun deleteFeedSavedSearch(savedSearch: FeedSavedSearch) = db.delete().`object`(savedSearch).prepare()
-
-    fun deleteFeedSavedSearch(id: Long) = db.delete()
-        .byQuery(
-            DeleteQuery.builder()
-                .table(FeedSavedSearchTable.TABLE)
-                .where("${FeedSavedSearchTable.COL_ID} = ?")
-                .whereArgs(id)
-                .build(),
-        ).prepare()
-
-    fun deleteAllFeedSavedSearches() = db.delete().byQuery(
-        DeleteQuery.builder()
-            .table(FeedSavedSearchTable.TABLE)
-            .build(),
-    )
-        .prepare()
-
-    fun getGlobalSavedSearchesFeed() = db.get()
-        .listOfObjects(SavedSearch::class.java)
-        .withQuery(
-            RawQuery.builder()
-                .query(getGlobalFeedSavedSearchQuery())
-                .build(),
-        )
-        .prepare()
-
-    fun getSourceSavedSearchesFeed(sourceId: Long) = db.get()
-        .listOfObjects(SavedSearch::class.java)
-        .withQuery(
-            RawQuery.builder()
-                .query(getSourceFeedSavedSearchQuery())
-                .args(sourceId)
-                .build(),
-        )
-        .prepare()
-
-    /*fun setMangasForMergedManga(mergedMangaId: Long, mergedMangases: List<SavedSearch>) {
-        db.inTransaction {
-            deleteSavedSearches(mergedMangaId).executeAsBlocking()
-            mergedMangases.chunked(100) { chunk ->
-                insertSavedSearches(chunk).executeAsBlocking()
-            }
-        }
-    }*/
-}
+interface FeedSavedSearchQueries : DbProvider

app/src/main/java/exh/savedsearches/queries/SavedSearchQueries.kt

@@ -1,93 +1,5 @@
 package exh.savedsearches.queries
 
-import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
-import com.pushtorefresh.storio.sqlite.queries.Query
 import eu.kanade.tachiyomi.data.database.DbProvider
-import exh.savedsearches.models.SavedSearch
-import exh.savedsearches.tables.SavedSearchTable
 
-interface SavedSearchQueries : DbProvider {
-    fun getSavedSearches(source: Long) = db.get()
-        .listOfObjects(SavedSearch::class.java)
-        .withQuery(
-            Query.builder()
-                .table(SavedSearchTable.TABLE)
-                .where("${SavedSearchTable.COL_SOURCE} = ?")
-                .whereArgs(source)
-                .build(),
-        )
-        .prepare()
-
-    fun deleteSavedSearches(source: Long) = db.delete()
-        .byQuery(
-            DeleteQuery.builder()
-                .table(SavedSearchTable.TABLE)
-                .where("${SavedSearchTable.COL_SOURCE} = ?")
-                .whereArgs(source)
-                .build(),
-        )
-        .prepare()
-
-    fun getSavedSearches() = db.get()
-        .listOfObjects(SavedSearch::class.java)
-        .withQuery(
-            Query.builder()
-                .table(SavedSearchTable.TABLE)
-                .orderBy(SavedSearchTable.COL_ID)
-                .build(),
-        )
-        .prepare()
-
-    fun getSavedSearch(id: Long) = db.get()
-        .`object`(SavedSearch::class.java)
-        .withQuery(
-            Query.builder()
-                .table(SavedSearchTable.TABLE)
-                .where("${SavedSearchTable.COL_ID} = ?")
-                .whereArgs(id)
-                .build(),
-        )
-        .prepare()
-
-    fun getSavedSearches(ids: List<Long>) = db.get()
-        .listOfObjects(SavedSearch::class.java)
-        .withQuery(
-            Query.builder()
-                .table(SavedSearchTable.TABLE)
-                .where("${SavedSearchTable.COL_ID} IN (?)")
-                .whereArgs(ids.joinToString())
-                .build(),
-        )
-        .prepare()
-
-    fun insertSavedSearch(savedSearch: SavedSearch) = db.put().`object`(savedSearch).prepare()
-
-    fun insertSavedSearches(savedSearches: List<SavedSearch>) = db.put().objects(savedSearches).prepare()
-
-    fun deleteSavedSearch(savedSearch: SavedSearch) = db.delete().`object`(savedSearch).prepare()
-
-    fun deleteSavedSearch(id: Long) = db.delete()
-        .byQuery(
-            DeleteQuery.builder()
-                .table(SavedSearchTable.TABLE)
-                .where("${SavedSearchTable.COL_ID} = ?")
-                .whereArgs(id)
-                .build(),
-        ).prepare()
-
-    fun deleteAllSavedSearches() = db.delete().byQuery(
-        DeleteQuery.builder()
-            .table(SavedSearchTable.TABLE)
-            .build(),
-    )
-        .prepare()
-
-    /*fun setMangasForMergedManga(mergedMangaId: Long, mergedMangases: List<SavedSearch>) {
-        db.inTransaction {
-            deleteSavedSearches(mergedMangaId).executeAsBlocking()
-            mergedMangases.chunked(100) { chunk ->
-                insertSavedSearches(chunk).executeAsBlocking()
-            }
-        }
-    }*/
-}
+interface SavedSearchQueries : DbProvider

app/src/main/java/exh/savedsearches/tables/FeedSavedSearchTable.kt

@@ -11,18 +11,4 @@ object FeedSavedSearchTable {
     const val COL_SAVED_SEARCH_ID = "saved_search"
 
     const val COL_GLOBAL = "global"
-
-    val createTableQuery: String
-        get() =
-            """CREATE TABLE $TABLE(
-            $COL_ID INTEGER NOT NULL PRIMARY KEY,
-            $COL_SOURCE INTEGER NOT NULL,
-            $COL_SAVED_SEARCH_ID INTEGER,
-            $COL_GLOBAL BOOLEAN NOT NULL,
-            FOREIGN KEY($COL_SAVED_SEARCH_ID) REFERENCES ${SavedSearchTable.TABLE} (${SavedSearchTable.COL_ID})
-            ON DELETE CASCADE
-            )"""
-
-    val createSavedSearchIdIndexQuery: String
-        get() = "CREATE INDEX ${TABLE}_${COL_SAVED_SEARCH_ID}_index ON $TABLE($COL_SAVED_SEARCH_ID)"
 }

app/src/main/java/exh/savedsearches/tables/SavedSearchTable.kt

@@ -13,14 +13,4 @@ object SavedSearchTable {
     const val COL_QUERY = "query"
 
     const val COL_FILTERS_JSON = "filters_json"
-
-    val createTableQuery: String
-        get() =
-            """CREATE TABLE $TABLE(
-            $COL_ID INTEGER NOT NULL PRIMARY KEY,
-            $COL_SOURCE INTEGER NOT NULL,
-            $COL_NAME TEXT NOT NULL,
-            $COL_QUERY TEXT,
-            $COL_FILTERS_JSON TEXT
-            )"""
 }