Merge pull request diesel-rs#3219 from Ten0/return_original_error_when_tm_broken_on_rollback

weiznich · web-flow · commit cbdfee30b206 · 2022-07-04T10:00:41.000Z
Return the original error when rollback attempt fails for `BrokenTransactionManager`
diff --git a/diesel/src/connection/transaction_manager.rs b/diesel/src/connection/transaction_manager.rs
@@ -55,10 +55,15 @@ pub trait TransactionManager<Conn: Connection> {
                 Self::commit_transaction(conn)?;
                 Ok(value)
             }
-            Err(user_error) => {
-                Self::rollback_transaction(conn)?;
-                Err(user_error)
-            }
+            Err(user_error) => match Self::rollback_transaction(conn) {
+                Ok(()) => Err(user_error),
+                Err(Error::BrokenTransactionManager) => {
+                    // In this case we are probably more interested by the
+                    // original error, which likely caused this
+                    Err(user_error)
+                }
+                Err(rollback_error) => Err(rollback_error.into()),
+            },
         }
     }
 }
diff --git a/diesel/src/pg/transaction.rs b/diesel/src/pg/transaction.rs
@@ -294,8 +294,15 @@ where
                 Ok(value)
             }
             Err(user_error) => {
-                AnsiTransactionManager::rollback_transaction(&mut *self.connection)?;
-                Err(user_error)
+                match AnsiTransactionManager::rollback_transaction(&mut *self.connection) {
+                    Ok(()) => Err(user_error),
+                    Err(Error::BrokenTransactionManager) => {
+                        // In this case we are probably more interested by the
+                        // original error, which likely caused this
+                        Err(user_error)
+                    }
+                    Err(rollback_error) => Err(rollback_error.into()),
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,15 @@ pub trait TransactionManager<Conn: Connection> {`
`55`	`55`	`Self::commit_transaction(conn)?;`
`56`	`56`	`Ok(value)`
`57`	`57`	`}`
`58`		`- Err(user_error) => {`
`59`		`- Self::rollback_transaction(conn)?;`
`60`		`- Err(user_error)`
`61`		`- }`
	`58`	`+ Err(user_error) => match Self::rollback_transaction(conn) {`
	`59`	`+ Ok(()) => Err(user_error),`
	`60`	`+ Err(Error::BrokenTransactionManager) => {`
	`61`	`+ // In this case we are probably more interested by the`
	`62`	`+ // original error, which likely caused this`
	`63`	`+ Err(user_error)`
	`64`	`+ }`
	`65`	`+ Err(rollback_error) => Err(rollback_error.into()),`
	`66`	`+ },`
`62`	`67`	`}`
`63`	`68`	`}`
`64`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,8 +294,15 @@ where`
`294`	`294`	`Ok(value)`
`295`	`295`	`}`
`296`	`296`	`Err(user_error) => {`
`297`		`- AnsiTransactionManager::rollback_transaction(&mut *self.connection)?;`
`298`		`- Err(user_error)`
	`297`	`+ match AnsiTransactionManager::rollback_transaction(&mut *self.connection) {`
	`298`	`+ Ok(()) => Err(user_error),`
	`299`	`+ Err(Error::BrokenTransactionManager) => {`
	`300`	`+ // In this case we are probably more interested by the`
	`301`	`+ // original error, which likely caused this`
	`302`	`+ Err(user_error)`
	`303`	`+ }`
	`304`	`+ Err(rollback_error) => Err(rollback_error.into()),`
	`305`	`+ }`
`299`	`306`	`}`
`300`	`307`	`}`
`301`	`308`	`}`