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

Changelog

Browse Source
This commit is contained in:
Chris Tsang 2023-04-26 21:32:16 +08:00
parent 28a5de09d6
commit 2746271190
2 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CHANGELOG.md
View File

@ -164,6 +164,26 @@ pub enum Relation {}
impl ActiveModelBehavior for ActiveModel {} impl ActiveModelBehavior for ActiveModel {}
``` ```
* Added macro `DerivePartialModel` https://github.com/SeaQL/sea-orm/pull/1597
```rs
#[derive(DerivePartialModel, FromQueryResult)]
#[sea_orm(entity = "Cake")]
struct PartialCake {
name: String,
#[sea_orm(
from_expr = r#"SimpleExpr::FunctionCall(Func::upper(Expr::col((Cake, cake::Column::Name))))"#
)]
name_upper: String,
}
assert_eq!(
cake::Entity::find()
.into_partial_model::<PartialCake>()
.into_statement(DbBackend::Sqlite)
.to_string(),
r#"SELECT "cake"."name", UPPER("cake"."name") AS "name_upper" FROM "cake""#
);
```
### Enhancements ### Enhancements

42
src/executor/select.rs
View File

@ -1,7 +1,7 @@
use crate::{ use crate::{
error::*, ConnectionTrait, EntityTrait, FromQueryResult, IdenStatic, Iterable, ModelTrait, error::*, ConnectionTrait, DbBackend, EntityTrait, FromQueryResult, IdenStatic, Iterable,
PartialModelTrait, PrimaryKeyToColumn, QueryResult, QuerySelect, Select, SelectA, SelectB, ModelTrait, PartialModelTrait, PrimaryKeyToColumn, QueryResult, QuerySelect, Select, SelectA,
SelectTwo, SelectTwoMany, Statement, StreamTrait, TryGetableMany, SelectB, SelectTwo, SelectTwoMany, Statement, StreamTrait, TryGetableMany,
}; };
use futures::{Stream, TryStreamExt}; use futures::{Stream, TryStreamExt};
use sea_query::SelectStatement; use sea_query::SelectStatement;
@ -155,6 +155,32 @@ where
} }
/// Return a [Selector] from `Self` that wraps a [SelectModel] with a [PartialModel](PartialModelTrait) /// Return a [Selector] from `Self` that wraps a [SelectModel] with a [PartialModel](PartialModelTrait)
///
/// ```
/// # #[cfg(feature = "macros")]
/// # {
/// use sea_orm::{entity::*, query::*, tests_cfg::cake::{self, Entity as Cake}, DbBackend, DerivePartialModel, FromQueryResult};
/// use sea_query::{SimpleExpr, Expr, Func};
///
/// #[derive(DerivePartialModel, FromQueryResult)]
/// #[sea_orm(entity = "Cake")]
/// struct PartialCake {
/// name: String,
/// #[sea_orm(
/// from_expr = r#"SimpleExpr::FunctionCall(Func::upper(Expr::col((Cake, cake::Column::Name))))"#
/// )]
/// name_upper: String,
/// }
///
/// assert_eq!(
/// cake::Entity::find()
/// .into_partial_model::<PartialCake>()
/// .into_statement(DbBackend::Sqlite)
/// .to_string(),
/// r#"SELECT "cake"."name", UPPER("cake"."name") AS "name_upper" FROM "cake""#
/// );
/// # }
/// ```
pub fn into_partial_model<M>(self) -> Selector<SelectModel<M>> pub fn into_partial_model<M>(self) -> Selector<SelectModel<M>>
where where
M: PartialModelTrait, M: PartialModelTrait,
@ -629,6 +655,11 @@ where
} }
} }
/// Get the SQL statement
pub fn into_statement(self, builder: DbBackend) -> Statement {
builder.build(&self.query)
}
/// Get an item from the Select query /// Get an item from the Select query
pub async fn one<'a, C>(mut self, db: &C) -> Result<Option<S::Item>, DbErr> pub async fn one<'a, C>(mut self, db: &C) -> Result<Option<S::Item>, DbErr>
where where
@ -829,6 +860,11 @@ where
} }
} }
/// Get the SQL statement
pub fn into_statement(self) -> Statement {
self.stmt
}
/// Get an item from the Select query /// Get an item from the Select query
/// ``` /// ```
/// # use sea_orm::{error::*, tests_cfg::*, *}; /// # use sea_orm::{error::*, tests_cfg::*, *};