Skip to content

Use INSERT OR IGNORE for excluded_statuses markers #2189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jocmp merged 2 commits into from
Aug 2, 2026
Merged

Use INSERT OR IGNORE for excluded_statuses markers #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d530c85
Use INSERT OR IGNORE for excluded_statuses markers
mjhfunctionalashtanga Jul 11, 2026
e3427c9
Dedupe status IDs and cover repeated markers
jocmp Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions capy/src/main/java/com/jocmp/capy/persistence/ArticleRecords.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class ArticleRecords(
val updated = updatedAt.toEpochSecond()

database.transactionWithErrorHandling {
articleIDs.forEach { articleID ->
articleIDs.distinct().forEach { articleID ->
database.articlesQueries.upsertUnread(
articleID = articleID,
updatedAt = updated
Expand All @@ -174,7 +174,7 @@ class ArticleRecords(
val updated = updatedAt.toEpochSecond()

database.transactionWithErrorHandling {
articleIDs.forEach { articleID ->
articleIDs.distinct().forEach { articleID ->
database.articlesQueries.upsertStarred(
articleID = articleID,
updatedAt = updated
Expand Down
4 changes: 2 additions & 2 deletions capy/src/main/sqldelight/com/jocmp/capy/db/articles.sq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ upsertUnread {
last_read_at = excluded.last_read_at,
read = excluded.read;

INSERT INTO excluded_statuses(
INSERT OR IGNORE INTO excluded_statuses(
article_id,
type
)
Expand Down Expand Up @@ -186,7 +186,7 @@ upsertStarred {
SET
starred = excluded.starred;

INSERT INTO excluded_statuses(
INSERT OR IGNORE INTO excluded_statuses(
article_id,
type
)
Expand Down
46 changes: 46 additions & 0 deletions capy/src/test/java/com/jocmp/capy/persistence/ArticleRecordsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,52 @@ class ArticleRecordsTest {
assertTrue(articleRecords.find(readArticle.id)!!.read)
}

@Test
fun markAllUnread_withDuplicateIDs() = runTest {
val articleIDs = 3.repeated { RandomUUID.generate() }
val readArticle = articleFixture.create(read = false)

articleIDs.forEach { id ->
articleFixture.create(id = id, read = true)
}

articleRecords.markAllUnread(articleIDs + articleIDs.first())

val articles = articleIDs.map { articleRecords.find(it)!! }

assertTrue(articles.none { it.read })
assertTrue(articleRecords.find(readArticle.id)!!.read)
}

@Test
fun markAllStarred_withDuplicateIDs() = runTest {
val articleIDs = 3.repeated { RandomUUID.generate() }

articleIDs.forEach { id ->
articleFixture.create(id = id)
}

articleRecords.markAllStarred(articleIDs + articleIDs.first())

val articles = articleIDs.map { articleRecords.find(it)!! }

assertTrue(articles.all { it.starred })
}

@Test
fun upsertUnread_ignoresRepeatedMarkers() = runTest {
val article = articleFixture.create(read = true)
val updatedAt = nowUTC().toEpochSecond()

database.transaction {
database.articlesQueries.upsertUnread(articleID = article.id, updatedAt = updatedAt)
database.articlesQueries.upsertUnread(articleID = article.id, updatedAt = updatedAt)
database.articlesQueries.updateStaleUnreads()
}

assertFalse(articleRecords.find(article.id)!!.read)
}

@Test
fun deleteOldArticles() = runTest {
val oldPublishedAt = nowUTC().minusMonths(4).toEpochSecond()
Expand Down
Loading