Simplify feed queries

bubelov · bubelov · commit fe4429b8f06e · 2026-04-04T21:09:07.000+07:00
diff --git a/app/src/main/kotlin/org/vestifeed/db/Database.kt b/app/src/main/kotlin/org/vestifeed/db/Database.kt
@@ -6,8 +6,8 @@ import org.vestifeed.db.table.ConfQueries
 import org.vestifeed.db.table.ConfSchema
 import org.vestifeed.db.table.EntryQueries
 import org.vestifeed.db.table.EntrySchema
+import org.vestifeed.db.table.FEED_SCHEMA
 import org.vestifeed.db.table.FeedQueries
-import org.vestifeed.db.table.FeedSchema
 
 class Database(driver: SQLiteDriver, val path: String) {
 
@@ -26,7 +26,7 @@ class Database(driver: SQLiteDriver, val path: String) {
         val version = if (stmt.step()) stmt.getInt(0) else 0
 
         if (version == 0) {
-            conn.execSQL(FeedSchema.toString())
+            conn.execSQL(FEED_SCHEMA)
             conn.execSQL(EntrySchema.toString())
             conn.execSQL(ConfSchema.toString())
             conn.execSQL("PRAGMA user_version=1;")
diff --git a/app/src/main/kotlin/org/vestifeed/db/SQLiteStatementExt.kt b/app/src/main/kotlin/org/vestifeed/db/SQLiteStatementExt.kt
@@ -10,6 +10,10 @@ fun SQLiteStatement.bindTextOrNull(index: Int, value: String?) {
     if (value == null) bindNull(index) else bindText(index, value)
 }
 
+fun SQLiteStatement.bindBooleanOrNull(index: Int, value: Boolean?) {
+    if (value == null) bindNull(index) else bindInt(index, if (value) 1 else 0)
+}
+
 fun SQLiteStatement.bindLongOrNull(index: Int, value: Long?) {
     if (value == null) bindNull(index) else bindLong(index, value)
 }
@@ -29,6 +33,9 @@ fun SQLiteStatement.bindJsonObjectOrNull(index: Int, value: JsonObject?) {
 fun SQLiteStatement.getTextOrNull(index: Int): String? =
     if (isNull(index)) null else getText(index)
 
+fun SQLiteStatement.getBoolOrNull(index: Int): Boolean? =
+    if (isNull(index)) null else getInt(index) != 0
+
 fun SQLiteStatement.getLongOrNull(index: Int): Long? =
     if (isNull(index)) null else getLong(index)
 
diff --git a/app/src/main/kotlin/org/vestifeed/db/table/Feed.kt b/app/src/main/kotlin/org/vestifeed/db/table/Feed.kt
@@ -1,39 +1,23 @@
 package org.vestifeed.db.table
 
 import androidx.sqlite.SQLiteConnection
-import androidx.sqlite.SQLiteStatement
 import androidx.sqlite.execSQL
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.vestifeed.db.bindBooleanOrNull
+import org.vestifeed.db.getBoolOrNull
 import org.vestifeed.parser.AtomLinkRel
 import kotlin.collections.forEach
 
-object FeedSchema {
-    const val TABLE_NAME = "feed"
-
-    override fun toString(): String {
-        return """
-            CREATE TABLE $TABLE_NAME (
-                ${Columns.Id} TEXT PRIMARY KEY NOT NULL,
-                ${Columns.Links} TEXT,
-                ${Columns.Title} TEXT NOT NULL,
-                ${Columns.ExtOpenEntriesInBrowser} INTEGER,
-                ${Columns.ExtBlockedWords} TEXT,
-                ${Columns.ExtShowPreviewImages} INTEGER
-            );
-        """.trimIndent()
-    }
-
-    enum class Columns(val sqlName: String) {
-        Id("id"),
-        Links("links"),
-        Title("title"),
-        ExtOpenEntriesInBrowser("ext_open_entries_in_browser"),
-        ExtBlockedWords("ext_blocked_words"),
-        ExtShowPreviewImages("ext_show_preview_images");
-
-        override fun toString() = sqlName
-    }
-}
+const val FEED_SCHEMA = """
+    CREATE TABLE feed (
+        id TEXT PRIMARY KEY NOT NULL,
+        links TEXT,
+        title TEXT NOT NULL,
+        ext_open_entries_in_browser INTEGER,
+        ext_blocked_words TEXT,
+        ext_show_preview_images INTEGER
+    );
+ """
 
 typealias Feed = FeedProjection
 
@@ -44,25 +28,7 @@ data class FeedProjection(
     val extOpenEntriesInBrowser: Boolean?,
     val extBlockedWords: String,
     val extShowPreviewImages: Boolean?,
-) {
-    companion object {
-        val columns: String
-            get() {
-                return FeedSchema.Columns.entries.joinToString(",") { it.sqlName }
-            }
-
-        fun fromStatement(stmt: SQLiteStatement): FeedProjection {
-            return FeedProjection(
-                id = stmt.getText(0),
-                links = jsonToLinks(stmt.getText(1)),
-                title = stmt.getText(2),
-                extOpenEntriesInBrowser = if (stmt.isNull(3)) null else stmt.getInt(3) == 1,
-                extBlockedWords = stmt.getText(4),
-                extShowPreviewImages = if (stmt.isNull(5)) null else stmt.getInt(5) == 1
-            )
-        }
-    }
-}
+)
 
 class FeedQueries(private val conn: SQLiteConnection) {
     fun insertOrReplace(feeds: List<Feed>) {
@@ -73,25 +39,17 @@ class FeedQueries(private val conn: SQLiteConnection) {
         conn.prepare(
             """
             INSERT OR REPLACE
-            INTO ${FeedSchema.TABLE_NAME} (${FeedProjection.columns})
+            INTO feed (id, links, title, ext_open_entries_in_browser, ext_blocked_words, ext_show_preview_images)
             VALUES (?, ?, ?, ?, ?, ?);
             """
         ).use { stmt ->
             feeds.forEach { feed ->
                 stmt.bindText(1, feed.id)
                 stmt.bindText(2, linksToJson(feed.links))
                 stmt.bindText(3, feed.title)
-                if (feed.extOpenEntriesInBrowser != null) {
-                    stmt.bindInt(4, if (feed.extOpenEntriesInBrowser) 1 else 0)
-                } else {
-                    stmt.bindNull(4)
-                }
+                stmt.bindBooleanOrNull(4, feed.extOpenEntriesInBrowser)
                 stmt.bindText(5, feed.extBlockedWords)
-                if (feed.extShowPreviewImages != null) {
-                    stmt.bindInt(6, if (feed.extShowPreviewImages) 1 else 0)
-                } else {
-                    stmt.bindNull(6)
-                }
+                stmt.bindBooleanOrNull(6, feed.extShowPreviewImages)
                 stmt.step()
                 stmt.reset()
             }
@@ -101,14 +59,23 @@ class FeedQueries(private val conn: SQLiteConnection) {
     fun selectAll(): List<FeedProjection> {
         conn.prepare(
             """
-            SELECT ${FeedProjection.columns}
-            FROM ${FeedSchema.TABLE_NAME}
-            ORDER BY ${FeedSchema.Columns.Title};
+            SELECT id, links, title, ext_open_entries_in_browser, ext_blocked_words, ext_show_preview_images
+            FROM feed
+            ORDER BY title;
             """
         ).use { stmt ->
             return buildList {
                 while (stmt.step()) {
-                    add(FeedProjection.fromStatement(stmt))
+                    add(
+                        FeedProjection(
+                            id = stmt.getText(0),
+                            links = jsonToLinks(stmt.getText(1)),
+                            title = stmt.getText(2),
+                            extOpenEntriesInBrowser = stmt.getBoolOrNull(3),
+                            extBlockedWords = stmt.getText(4),
+                            extShowPreviewImages = stmt.getBoolOrNull(5),
+                        )
+                    )
                 }
             }
         }
@@ -128,10 +95,10 @@ class FeedQueries(private val conn: SQLiteConnection) {
         conn.prepare(
             """
             SELECT f.*, COUNT(e.id) as unread_entries
-            FROM ${FeedSchema.TABLE_NAME} f
-            LEFT JOIN entry e ON e.feed_id = f.${FeedSchema.Columns.Id} AND e.ext_read = 0 AND e.ext_bookmarked = 0
-            GROUP BY f.${FeedSchema.Columns.Id}
-            ORDER BY f.${FeedSchema.Columns.Title};   
+            FROM feed f
+            LEFT JOIN entry e ON e.feed_id = f.id AND e.ext_read = 0 AND e.ext_bookmarked = 0
+            GROUP BY f.id
+            ORDER BY f.title;   
             """
         ).use { stmt ->
             return buildList {
@@ -155,8 +122,8 @@ class FeedQueries(private val conn: SQLiteConnection) {
     fun selectAllLinks(): List<List<Link>> {
         conn.prepare(
             """
-            SELECT ${FeedSchema.Columns.Links}
-            FROM ${FeedSchema.TABLE_NAME};
+            SELECT links
+            FROM feed;
             """
         ).use { stmt ->
             return buildList {
@@ -170,21 +137,28 @@ class FeedQueries(private val conn: SQLiteConnection) {
     fun selectById(id: String): FeedProjection? {
         conn.prepare(
             """
-            SELECT ${FeedProjection.columns}
-            FROM ${FeedSchema.TABLE_NAME}
+            SELECT id, links, title, ext_open_entries_in_browser, ext_blocked_words, ext_show_preview_images
+            FROM feed
             WHERE id = ?;
             """
         ).use { stmt ->
             stmt.bindText(1, id)
-            return if (stmt.step()) FeedProjection.fromStatement(stmt) else null
+            return if (stmt.step()) FeedProjection(
+                id = stmt.getText(0),
+                links = jsonToLinks(stmt.getText(1)),
+                title = stmt.getText(2),
+                extOpenEntriesInBrowser = stmt.getBoolOrNull(3),
+                extBlockedWords = stmt.getText(4),
+                extShowPreviewImages = stmt.getBoolOrNull(5),
+            ) else null
         }
     }
 
     fun deleteById(id: String) {
         conn.prepare(
             """
-            DELETE FROM ${FeedSchema.TABLE_NAME}
-            WHERE ${FeedSchema.Columns.Id} = ?;
+            DELETE FROM feed
+            WHERE id = ?;
             """
         ).use { stmt ->
             stmt.bindText(1, id)
@@ -193,7 +167,7 @@ class FeedQueries(private val conn: SQLiteConnection) {
     }
 
     fun deleteAll() {
-        conn.execSQL("DELETE FROM ${FeedSchema.TABLE_NAME};")
+        conn.execSQL("DELETE FROM feed;")
     }
 }
 
@@ -237,7 +211,8 @@ private fun jsonToLinks(json: String?): List<Link> {
             hreflang = obj.get("hreflang")?.asString?.ifEmpty { null },
             title = obj.get("title")?.asString?.ifEmpty { null },
             length = obj.get("length")?.let { if (it.isJsonNull) null else it.asLong },
-            extEnclosureDownloadProgress = obj.get("extEnclosureDownloadProgress")?.let { if (it.isJsonNull) null else it.asDouble },
+            extEnclosureDownloadProgress = obj.get("extEnclosureDownloadProgress")
+                ?.let { if (it.isJsonNull) null else it.asDouble },
             extCacheUri = obj.get("extCacheUri")?.asString?.ifEmpty { null }
         )
     }
diff --git a/app/src/test/kotlin/org/vestifeed/db/table/FeedTest.kt b/app/src/test/kotlin/org/vestifeed/db/table/FeedTest.kt
@@ -21,26 +21,9 @@ class FeedTest {
         db = Database(BundledSQLiteDriver(), ":memory:")
     }
 
-    @Test
-    fun feedSchema_tableName() {
-        assertEquals("feed", FeedSchema.TABLE_NAME)
-    }
-
-    @Test
-    fun feedSchema_columns() {
-        val columns = FeedSchema.Columns.entries
-        assertEquals(6, columns.size)
-        assertEquals("id", columns[0].sqlName)
-        assertEquals("links", columns[1].sqlName)
-        assertEquals("title", columns[2].sqlName)
-        assertEquals("ext_open_entries_in_browser", columns[3].sqlName)
-        assertEquals("ext_blocked_words", columns[4].sqlName)
-        assertEquals("ext_show_preview_images", columns[5].sqlName)
-    }
-
     @Test
     fun feedSchema_createTableStatement() {
-        val statement = FeedSchema.toString()
+        val statement = FEED_SCHEMA
         assertTrue(statement.contains("CREATE TABLE feed"))
         assertTrue(statement.contains("id TEXT PRIMARY KEY NOT NULL"))
         assertTrue(statement.contains("links TEXT"))
@@ -50,12 +33,6 @@ class FeedTest {
         assertTrue(statement.contains("ext_show_preview_images INTEGER"))
     }
 
-    @Test
-    fun feedProjection_columns() {
-        val columns = FeedProjection.columns
-        assertEquals("id,links,title,ext_open_entries_in_browser,ext_blocked_words,ext_show_preview_images", columns)
-    }
-
     @Test
     fun feedQueries_insertOrReplace() {
         val feed = createFeed()
