caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clippy warning

Browse Source
This commit is contained in:
Chris Tsang 2021-10-04 22:40:17 +08:00
parent df4df87d09
commit 8d0ba28b7e
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/database/db_connection.rs
View File

@ -193,7 +193,7 @@ impl<'a> ConnectionTrait<'a> for DatabaseConnection {
DatabaseConnection::MockDatabaseConnection(conn) => { DatabaseConnection::MockDatabaseConnection(conn) => {
let transaction = DatabaseTransaction::new_mock(Arc::clone(conn)) let transaction = DatabaseTransaction::new_mock(Arc::clone(conn))
.await .await
.map_err(|e| TransactionError::Connection(e))?; .map_err(TransactionError::Connection)?;
transaction.run(_callback).await transaction.run(_callback).await
} }
DatabaseConnection::Disconnected => panic!("Disconnected"), DatabaseConnection::Disconnected => panic!("Disconnected"),
@ -202,10 +202,7 @@ impl<'a> ConnectionTrait<'a> for DatabaseConnection {
#[cfg(feature = "mock")] #[cfg(feature = "mock")]
fn is_mock_connection(&self) -> bool { fn is_mock_connection(&self) -> bool {
match self { matches!(self, DatabaseConnection::MockDatabaseConnection(_))
DatabaseConnection::MockDatabaseConnection(_) => true,
_ => false,
}
} }
} }

8
src/database/transaction.rs
View File

@ -110,15 +110,15 @@ impl DatabaseTransaction {
{ {
let res = callback(&self) let res = callback(&self)
.await .await
.map_err(|e| TransactionError::Transaction(e)); .map_err(TransactionError::Transaction);
if res.is_ok() { if res.is_ok() {
self.commit() self.commit()
.await .await
.map_err(|e| TransactionError::Connection(e))?; .map_err(TransactionError::Connection)?;
} else { } else {
self.rollback() self.rollback()
.await .await
.map_err(|e| TransactionError::Connection(e))?; .map_err(TransactionError::Connection)?;
} }
res res
} }
@ -341,7 +341,7 @@ impl<'a> ConnectionTrait<'a> for DatabaseTransaction {
let transaction = self let transaction = self
.begin() .begin()
.await .await
.map_err(|e| TransactionError::Connection(e))?; .map_err(TransactionError::Connection)?;
transaction.run(_callback).await transaction.run(_callback).await
} }
} }

2
src/driver/mock.rs
View File

@ -114,7 +114,7 @@ impl MockDatabaseConnection {
statement: &Statement, statement: &Statement,
) -> Pin<Box<dyn Stream<Item = Result<QueryResult, DbErr>>>> { ) -> Pin<Box<dyn Stream<Item = Result<QueryResult, DbErr>>>> {
match self.query_all(statement.clone()) { match self.query_all(statement.clone()) {
Ok(v) => Box::pin(futures::stream::iter(v.into_iter().map(|r| Ok(r)))), Ok(v) => Box::pin(futures::stream::iter(v.into_iter().map(Ok))),
Err(e) => Box::pin(futures::stream::iter(Some(Err(e)).into_iter())), Err(e) => Box::pin(futures::stream::iter(Some(Err(e)).into_iter())),
} }
} }