diff --git a/src/driver/sqlx_mysql.rs b/src/driver/sqlx_mysql.rs index 2f31dbb4..80d5a7b9 100644 --- a/src/driver/sqlx_mysql.rs +++ b/src/driver/sqlx_mysql.rs @@ -7,7 +7,7 @@ use sqlx::{ sea_query::sea_query_driver_mysql!(); use sea_query_driver_mysql::bind_query; -use crate::{connector::*, debug_print, DatabaseConnection, Statement}; +use crate::{debug_print, executor::*, DatabaseConnection, Statement}; pub struct SqlxMySqlConnector; diff --git a/src/connector/mod.rs b/src/executor/connector.rs similarity index 59% rename from src/connector/mod.rs rename to src/executor/connector.rs index ff43220e..5a6daf4d 100644 --- a/src/connector/mod.rs +++ b/src/executor/connector.rs @@ -1,19 +1,4 @@ -mod delete; -mod executor; -mod insert; -mod paginator; -mod query; -mod select; -mod update; - -pub use delete::*; -pub use executor::*; -pub use insert::*; -pub use paginator::*; -pub use query::*; -pub use select::*; -pub use update::*; - +use super::{ExecErr, ExecResult, QueryErr, QueryResult}; use crate::{DatabaseConnection, Statement}; use async_trait::async_trait; use std::{error::Error, fmt}; @@ -34,28 +19,9 @@ pub trait Connection { async fn query_all(&self, stmt: Statement) -> Result, QueryErr>; } -#[derive(Debug)] -pub struct QueryErr; - #[derive(Debug)] pub struct ConnectionErr; -// QueryErr // - -impl Error for QueryErr {} - -impl fmt::Display for QueryErr { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "{:?}", self) - } -} - -impl From for QueryErr { - fn from(_: TypeErr) -> QueryErr { - QueryErr - } -} - // ConnectionErr // impl Error for ConnectionErr {} diff --git a/src/connector/delete.rs b/src/executor/delete.rs similarity index 100% rename from src/connector/delete.rs rename to src/executor/delete.rs diff --git a/src/connector/executor.rs b/src/executor/execute.rs similarity index 100% rename from src/connector/executor.rs rename to src/executor/execute.rs diff --git a/src/connector/insert.rs b/src/executor/insert.rs similarity index 100% rename from src/connector/insert.rs rename to src/executor/insert.rs diff --git a/src/executor/mod.rs b/src/executor/mod.rs new file mode 100644 index 00000000..7f37bcf1 --- /dev/null +++ b/src/executor/mod.rs @@ -0,0 +1,17 @@ +mod connector; +mod delete; +mod execute; +mod insert; +mod paginator; +mod query; +mod select; +mod update; + +pub use connector::*; +pub use delete::*; +pub use execute::*; +pub use insert::*; +pub use paginator::*; +pub use query::*; +pub use select::*; +pub use update::*; diff --git a/src/connector/paginator.rs b/src/executor/paginator.rs similarity index 100% rename from src/connector/paginator.rs rename to src/executor/paginator.rs diff --git a/src/connector/query.rs b/src/executor/query.rs similarity index 87% rename from src/connector/query.rs rename to src/executor/query.rs index 713fbb87..e7da0604 100644 --- a/src/connector/query.rs +++ b/src/executor/query.rs @@ -11,6 +11,9 @@ pub(crate) enum QueryResultRow { SqlxMySql(MySqlRow), } +#[derive(Debug)] +pub struct QueryErr; + #[derive(Debug)] pub struct TypeErr; @@ -77,6 +80,22 @@ impl QueryResult { } } +// QueryErr // + +impl Error for QueryErr {} + +impl fmt::Display for QueryErr { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "{:?}", self) + } +} + +impl From for QueryErr { + fn from(_: TypeErr) -> QueryErr { + QueryErr + } +} + // TypeErr // impl Error for TypeErr {} diff --git a/src/connector/select.rs b/src/executor/select.rs similarity index 100% rename from src/connector/select.rs rename to src/executor/select.rs diff --git a/src/connector/update.rs b/src/executor/update.rs similarity index 100% rename from src/connector/update.rs rename to src/executor/update.rs diff --git a/src/lib.rs b/src/lib.rs index cf31c77b..89b83a4d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,15 +1,15 @@ -mod connector; mod database; mod driver; pub mod entity; +mod executor; pub mod query; pub mod tests_cfg; mod util; -pub use connector::*; pub use database::*; pub use driver::*; pub use entity::*; +pub use executor::*; pub use query::*; pub use sea_orm_macros::{ diff --git a/src/query/mod.rs b/src/query/mod.rs index b76667ab..7f32edc5 100644 --- a/src/query/mod.rs +++ b/src/query/mod.rs @@ -20,4 +20,4 @@ pub use select::*; pub use traits::*; pub use update::*; -pub use crate::connector::{ExecErr, QueryErr}; +pub use crate::executor::{ExecErr, QueryErr};