Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1696 fix #1702

Merged
merged 12 commits into from
Jun 13, 2023
2 changes: 1 addition & 1 deletion build-tools/docker-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Delete all containers
# $ docker rm -f $(docker ps -a -q)
#
# Delete all volumns
# Delete all volumes
# $ docker volume rm $(docker volume ls -q)
#
# Delete all images
Expand Down
75 changes: 74 additions & 1 deletion src/query/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::{
};
use sea_query::{
Alias, ConditionType, Expr, Iden, IntoCondition, IntoIden, LockType, SeaRc, SelectExpr,
SelectStatement, TableRef,
SelectStatement, SimpleExpr, TableRef,
};
pub use sea_query::{Condition, ConditionalStatement, DynIden, JoinType, Order, OrderedStatement};

Expand Down Expand Up @@ -446,6 +446,79 @@ pub trait QuerySelect: Sized {
self.query().lock_exclusive();
self
}

/// Add an expression to the select expression list.
/// ```
/// use sea_orm::sea_query::Expr;
/// use sea_orm::{entity::*, tests_cfg::cake, DbBackend, QuerySelect, QueryTrait};
///
/// assert_eq!(
/// cake::Entity::find()
/// .select_only()
/// .expr(Expr::col((cake::Entity, cake::Column::Id)))
/// .build(DbBackend::MySql)
/// .to_string(),
/// "SELECT `cake`.`id` FROM `cake`"
/// );
/// ```
fn expr<T>(mut self, expr: T) -> Self
where
T: Into<SelectExpr>,
{
self.query().expr(expr);
self
}

/// Add select expressions from vector of [`SelectExpr`].
/// ```
/// use sea_orm::sea_query::Expr;
/// use sea_orm::{entity::*, tests_cfg::cake, DbBackend, QuerySelect, QueryTrait};
///
/// assert_eq!(
/// cake::Entity::find()
/// .select_only()
/// .exprs([
/// Expr::col((cake::Entity, cake::Column::Id)),
/// Expr::col((cake::Entity, cake::Column::Name)),
/// ])
/// .build(DbBackend::MySql)
/// .to_string(),
/// "SELECT `cake`.`id`, `cake`.`name` FROM `cake`"
/// );
/// ```
fn exprs<T, I>(mut self, exprs: I) -> Self
where
T: Into<SelectExpr>,
I: IntoIterator<Item = T>,
{
self.query().exprs(exprs);
self
}

/// Select column.
/// ```
/// use sea_orm::sea_query::{Alias, Expr, Func};
/// use sea_orm::{entity::*, tests_cfg::cake, DbBackend, QuerySelect, QueryTrait};
///
/// assert_eq!(
/// cake::Entity::find()
/// .expr_as(
/// Func::upper(Expr::col((cake::Entity, cake::Column::Name))),
/// Alias::new("name_upper")
/// )
/// .build(DbBackend::MySql)
/// .to_string(),
/// "SELECT `cake`.`id`, `cake`.`name`, UPPER(`cake`.`name`) AS `name_upper` FROM `cake`"
/// );
/// ```
fn expr_as<T, A>(&mut self, expr: T, alias: A) -> &mut Self
where
T: Into<SimpleExpr>,
A: IntoIden,
{
self.query().expr_as(expr, alias);
self
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One final change, we may well align it with QuerySelect::column_as method and take an alias of I: IntoIdentity

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hint: better update the example to supply an &str as the alias

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done!

}

// LINT: when the column does not appear in tables selected from
Expand Down