Skip to content

fix(core): retry entire SQLite transaction on DatabaseBusy #34533

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
FrozenPandaz merged 1 commit into from
Feb 23, 2026
Merged

fix(core): retry entire SQLite transaction on DatabaseBusy #34533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 6 additions & 11 deletions packages/nx/src/native/db/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,12 @@ impl NxDbConnection {
transaction_operation: impl Fn(&Connection) -> rusqlite::Result<T>,
) -> Result<T> {
if let Some(conn) = self.conn.as_mut() {
let transaction = retry_db_operation_when_busy!(conn.transaction())
.map_err(|e| anyhow::anyhow!("DB transaction error: {:?}", e))?;

let result = transaction_operation(&transaction)
.map_err(|e| anyhow::anyhow!("DB transaction operation error: {:?}", e))?;

transaction
.commit()
.map_err(|e| anyhow::anyhow!("DB transaction commit error: {:?}", e))?;

Ok(result)
retry_db_operation_when_busy!(conn.transaction().and_then(|tx| {
let result = transaction_operation(&tx)?;
tx.commit()?;
Ok(result)
}))
.map_err(|e| anyhow::anyhow!("DB transaction error: {:?}", e))
} else {
anyhow::bail!("No database connection available")
}
Expand Down
Loading