Merge pull request #13 from weiznich/update_to_diesel_master

Update to diesels master branch

Author: weiznich

Cargo.lock

@@ -36,3 +36,6 @@ postgres = ["diesel/postgres_backend", "tokio-postgres", "tokio", "tokio/rt-mult
 name = "integration_tests"
 path = "tests/lib.rs"
 harness = true
+
+[patch.crates-io]
+diesel = {git = "https://github.com/diesel-rs/diesel", branch = "master"}

Cargo.toml

@@ -224,11 +224,16 @@ where
                 Self::TransactionManager::commit_transaction(self).await?;
                 Ok(value)
             }
-            Err(e) => {
-                Self::TransactionManager::rollback_transaction(self)
-                    .await
-                    .map_err(|e| diesel::result::Error::RollbackError(Box::new(e)))?;
-                Err(e)
+            Err(user_error) => {
+                match Self::TransactionManager::rollback_transaction(self).await {
+                    Ok(()) => Err(user_error),
+                    Err(diesel::result::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()),
+                }
             }
         }
     }

src/lib.rs

@@ -215,11 +215,16 @@ impl AsyncConnection for AsyncPgConnection {
                 Self::TransactionManager::commit_transaction(self).await?;
                 Ok(value)
             }
-            Err(e) => {
-                Self::TransactionManager::rollback_transaction(self)
-                    .await
-                    .map_err(|e| diesel::result::Error::RollbackError(Box::new(e)))?;
-                Err(e)
+            Err(user_error) => {
+                match Self::TransactionManager::rollback_transaction(self).await {
+                    Ok(()) => Err(user_error),
+                    Err(diesel::result::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()),
+                }
             }
         }
     }