🪲 BUG-#36: Fix race condition in SQLite save()#55
Merged
Conversation
FernandoCelmer
commented
Apr 16, 2026
Member
Author
FernandoCelmer
left a comment
There was a problem hiding this comment.
🔍 Code Review
Code issues found: 1
See inline comment below.
| stmt = sqlite_insert(RawModel).values( | ||
| message_id=raw.message_id, | ||
| uid=raw.uid, | ||
| mailbox=raw.mailbox, |
Member
Author
There was a problem hiding this comment.
[Suggestion]
Problem — With SQLite's INSERT ... ON CONFLICT DO UPDATE, result.rowcount returns 1 for both inserts and updates (any affected row = 1). This means save() now always returns True, never False for updates.
The docstring still says "Returns True if inserted, False if updated", which is now incorrect.
Failure scenario —
storage = StorageSQLite()
storage.save(raw) # -> True (inserted) OK
storage.save(raw) # -> True (updated, but claims inserted) WRONGThis directly affects sync.py:_save_one() which uses the return value to count result.inserted vs result.updated. After this PR, result.updated will always be 0.
Fix — Either update the docstring and _save_one() to not rely on the distinction, or check existence before the upsert:
existing = session.query(RawModel.uid).filter(
RawModel.uid == raw.uid, RawModel.mailbox == raw.mailbox
).first()
session.execute(stmt)
session.commit()
return existing is None # True if new, False if updated
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
UniqueConstraint("uid", "mailbox")toRawModelfor explicit upsert supportStorageSQLite.save()with SQLite'sINSERT OR REPLACEviasqlalchemy.dialects.sqlite.insertandon_conflict_do_updateCloses #36