Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions src/queryable/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,26 @@ impl<'a> Transaction<'a> {
Ok(Transaction(conn))
}

/// Performs `COMMIT` query.
pub async fn commit(mut self) -> Result<()> {
/// Performs `COMMIT` query or returns an error
async fn try_commit(&mut self) -> Result<()> {
let result = self.0.query_iter("COMMIT").await?;
result.drop_result().await?;
self.0.set_tx_status(TxStatus::None);
Ok(())
}

/// Performs `COMMIT` query or rollbacks when any error occurs and returns the original error.
pub async fn commit(mut self) -> Result<()> {
match self.try_commit().await {
Ok(..) => Ok(()),
Err(e) => {
self.0.query_drop("ROLLBACK").await.unwrap_or(());
self.0.set_tx_status(TxStatus::None);
Err(e)
}
}
}

/// Performs `ROLLBACK` query.
pub async fn rollback(mut self) -> Result<()> {
let result = self.0.query_iter("ROLLBACK").await?;
Expand Down
Loading