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

Merge FromQueryResultExt into FromQueryResult

Browse Source
This commit is contained in:
Chris Tsang 2021-09-17 15:03:23 +08:00
parent 94b5fbf413
commit 2e1371537a
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/entity/model.rs
View File

@ -28,20 +28,13 @@ pub trait ModelTrait: Clone + Send + Debug {
}
}
pub trait FromQueryResult {
fn from_query_result(res: &QueryResult, pre: &str) -> Result<Self, DbErr>
where
Self: Sized;
pub trait FromQueryResult: Sized {
fn from_query_result(res: &QueryResult, pre: &str) -> Result<Self, DbErr>;
fn from_query_result_optional(res: &QueryResult, pre: &str) -> Result<Option<Self>, DbErr>
where
Self: Sized,
{
fn from_query_result_optional(res: &QueryResult, pre: &str) -> Result<Option<Self>, DbErr> {
Ok(Self::from_query_result(res, pre).ok())
}
}
pub trait FromQueryResultExt: FromQueryResult + Sized {
/// ```
/// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend};
@ -107,5 +100,3 @@ pub trait FromQueryResultExt: FromQueryResult + Sized {
SelectorRaw::<SelectModel<Self>>::from_statement(stmt)
}
}
impl<T: FromQueryResult> FromQueryResultExt for T {}

5
src/entity/prelude.rs
View File

@ -2,9 +2,8 @@ pub use crate::{
error::*, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait, ColumnType,
DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity,
DeriveEntityModel, DeriveModel, DerivePrimaryKey, DeriveRelation, EntityName, EntityTrait,
EnumIter, ForeignKeyAction, FromQueryResultExt, Iden, IdenStatic, Linked, ModelTrait,
PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef,
RelationTrait, Select, Value,
EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked, ModelTrait, PrimaryKeyToColumn,
PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef, RelationTrait, Select, Value,
};
#[cfg(feature = "with-json")]