diff --git a/src/database/mock.rs b/src/database/mock.rs index 2f99b32c..c57ef63e 100644 --- a/src/database/mock.rs +++ b/src/database/mock.rs @@ -75,7 +75,7 @@ impl MockDatabaseTrait for MockDatabase { result: ExecResultHolder::Mock(std::mem::take(&mut self.exec_results[counter])), }) } else { - Err(DbErr::Execution) + Err(DbErr::Exec) } } diff --git a/src/database/mod.rs b/src/database/mod.rs index 5150e3d7..f461df3d 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -29,6 +29,6 @@ impl Database { if crate::MockDatabaseConnector::accepts(string) { return Ok(crate::MockDatabaseConnector::connect(string).await?); } - Err(DbErr::Connection) + Err(DbErr::Conn) } } diff --git a/src/driver/sqlx_mysql.rs b/src/driver/sqlx_mysql.rs index 9076c1ed..7ecbd5a2 100644 --- a/src/driver/sqlx_mysql.rs +++ b/src/driver/sqlx_mysql.rs @@ -25,7 +25,7 @@ impl SqlxMySqlConnector { SqlxMySqlPoolConnection { pool }, )) } else { - Err(DbErr::Connection) + Err(DbErr::Conn) } } } @@ -46,7 +46,7 @@ impl SqlxMySqlPoolConnection { return Ok(res.into()); } } - Err(DbErr::Execution) + Err(DbErr::Exec) } pub async fn query_one(&self, stmt: Statement) -> Result, DbErr> { diff --git a/src/driver/sqlx_sqlite.rs b/src/driver/sqlx_sqlite.rs index 94425eb4..161e010e 100644 --- a/src/driver/sqlx_sqlite.rs +++ b/src/driver/sqlx_sqlite.rs @@ -25,7 +25,7 @@ impl SqlxSqliteConnector { SqlxSqlitePoolConnection { pool }, )) } else { - Err(DbErr::Connection) + Err(DbErr::Conn) } } } @@ -46,7 +46,7 @@ impl SqlxSqlitePoolConnection { return Ok(res.into()); } } - Err(DbErr::Execution) + Err(DbErr::Exec) } pub async fn query_one(&self, stmt: Statement) -> Result, DbErr> { diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index df1fc869..31a1345d 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -227,7 +227,7 @@ where let model: Option = res?; match model { Some(model) => Ok(model.into_active_model()), - None => Err(DbErr::Execution), + None => Err(DbErr::Exec), } } else { Ok(A::default()) diff --git a/src/error.rs b/src/error.rs index de649dcb..712df544 100644 --- a/src/error.rs +++ b/src/error.rs @@ -2,8 +2,8 @@ use std::{error, fmt}; #[derive(Debug)] pub enum DbErr { - Connection, - Execution, + Conn, + Exec, Query, #[cfg(feature = "sqlx-dep")] Sqlx(sqlx::Error), @@ -12,8 +12,8 @@ pub enum DbErr { impl fmt::Display for DbErr { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { - Self::Connection => write!(f, "{:?}", "Connection Error"), - Self::Execution => write!(f, "{:?}", "Execution Error"), + Self::Conn => write!(f, "{:?}", "Connection Error"), + Self::Exec => write!(f, "{:?}", "Execution Error"), Self::Query => write!(f, "{:?}", "Query Error"), #[cfg(feature = "sqlx-dep")] Self::Sqlx(e) => write!(f, "{:?}", e), @@ -24,8 +24,8 @@ impl fmt::Display for DbErr { impl error::Error for DbErr { fn source(&self) -> Option<&(dyn error::Error + 'static)> { match self { - Self::Connection => None, - Self::Execution => None, + Self::Conn => None, + Self::Exec => None, Self::Query => None, #[cfg(feature = "sqlx-dep")] Self::Sqlx(e) => Some(e),