Import missing ExprTrait

Cargo.toml

@@ -109,4 +109,4 @@ seaography = ["sea-orm-macros/seaography"]
 # This allows us to develop using a local version of sea-query
 [patch.crates-io]
 # sea-query = { path = "../sea-query" }
-sea-query = { git = "https://github.com/SeaQL/sea-query.git", branch = "master" }
+sea-query = { git = "https://github.com/Huliiiiii/sea-query.git", branch = "expr-2" }

sea-orm-macros/src/derives/entity_model.rs

@@ -254,12 +254,12 @@ pub fn expand_derive_entity_model(data: Data, attrs: Vec<Attribute>) -> syn::Res
 
                     if let Some(select_as) = select_as {
                         columns_select_as.push(quote! {
-                            Self::#field_name => expr.cast_as(#select_as)
+                            Self::#field_name => ::sea_query::ExprTrait::cast_as(expr, #select_as)
                         });
                     }
                     if let Some(save_as) = save_as {
                         columns_save_as.push(quote! {
-                            Self::#field_name => val.cast_as(#save_as)
+                            Self::#field_name => ::sea_query::ExprTrait::cast_as(val, #save_as)
                         });
                     }
 

sea-orm-macros/src/lib.rs

@@ -749,6 +749,7 @@ pub fn derive_from_json_query_result(input: TokenStream) -> TokenStream {
 /// For more complete examples, please refer to https://github.com/SeaQL/sea-orm/blob/master/tests/partial_model_tests.rs
 ///
 /// ```rust
+/// use sea_orm::sea_query::ExprTrait;
 /// use sea_orm::{DerivePartialModel, FromQueryResult, entity::prelude::*};
 ///
 /// #[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
@@ -777,7 +778,11 @@ pub fn derive_from_json_query_result(input: TokenStream) -> TokenStream {
 ///
 /// If all fields in the partial model is `from_expr`, the specifying the `entity` can be skipped.
 /// ```
-/// use sea_orm::{DerivePartialModel, FromQueryResult, entity::prelude::*, sea_query::Expr};
+/// use sea_orm::{
+///     DerivePartialModel, FromQueryResult,
+///     entity::prelude::*,
+///     sea_query::{Expr, ExprTrait},
+/// };
 ///
 /// #[derive(Debug, FromQueryResult, DerivePartialModel)]
 /// struct SelectResult {

src/entity/active_enum.rs

@@ -1,5 +1,5 @@
 use crate::{ColIdx, ColumnDef, DbErr, Iterable, QueryResult, TryFromU64, TryGetError, TryGetable};
-use sea_query::{DynIden, Expr, Nullable, SimpleExpr, Value, ValueType};
+use sea_query::{DynIden, Expr, ExprTrait, Nullable, SimpleExpr, Value, ValueType};
 
 /// A Rust representation of enum defined in database.
 ///

src/entity/column.rs

@@ -1,7 +1,7 @@
 use crate::{DbBackend, EntityName, Iden, IdenStatic, IntoSimpleExpr, Iterable};
 use sea_query::{
-    Alias, BinOper, DynIden, Expr, IntoIden, IntoLikeExpr, SeaRc, SelectStatement, SimpleExpr,
-    Value,
+    Alias, BinOper, DynIden, Expr, ExprTrait, IntoIden, IntoLikeExpr, SeaRc, SelectStatement,
+    SimpleExpr, Value,
 };
 use std::str::FromStr;
 
@@ -265,7 +265,7 @@ pub trait ColumnTrait: IdenStatic + Iterable + FromStr {
 
     /// Construct a [`SimpleExpr::Column`] wrapped in [`Expr`].
     fn into_expr(self) -> Expr {
-        Expr::expr(self.into_simple_expr())
+        Expr::new(self.into_simple_expr())
     }
 
     /// Construct a returning [`Expr`].
@@ -1026,6 +1026,8 @@ mod tests {
         use crate::{ActiveModelTrait, ActiveValue, Update};
 
         mod hello_expanded {
+            use sea_query::ExprTrait;
+
             use crate as sea_orm;
             use crate::entity::prelude::*;
             use crate::sea_query::{Expr, SimpleExpr};
@@ -1157,6 +1159,8 @@ mod tests {
         use crate::{ActiveModelTrait, ActiveValue, Update};
 
         mod hello_expanded {
+            use sea_query::ExprTrait;
+
             use crate as sea_orm;
             use crate::entity::prelude::*;
             use crate::sea_query::{Expr, SimpleExpr};
@@ -1288,6 +1292,8 @@ mod tests {
         use crate::{ActiveModelTrait, ActiveValue, Update};
 
         mod hello_expanded {
+            use sea_query::ExprTrait;
+
             use crate as sea_orm;
             use crate::entity::prelude::*;
             use crate::sea_query::{Expr, SimpleExpr};

src/entity/relation.rs

@@ -290,7 +290,7 @@ impl RelationDef {
     ///
     /// ```
     /// use sea_orm::{entity::*, query::*, DbBackend, tests_cfg::{cake, cake_filling}};
-    /// use sea_query::{Expr, IntoCondition};
+    /// use sea_query::{Expr, ExprTrait, IntoCondition};
     ///
     /// assert_eq!(
     ///     cake::Entity::find()
@@ -328,7 +328,7 @@ impl RelationDef {
     ///
     /// ```
     /// use sea_orm::{entity::*, query::*, DbBackend, tests_cfg::{cake, cake_filling}};
-    /// use sea_query::{Expr, IntoCondition, ConditionType};
+    /// use sea_query::{Expr, ExprTrait, IntoCondition, ConditionType};
     ///
     /// assert_eq!(
     ///     cake::Entity::find()

src/executor/cursor.rs

@@ -4,8 +4,8 @@ use crate::{
     SelectThree, SelectThreeModel, SelectTwo, SelectTwoModel, SelectorTrait,
 };
 use sea_query::{
-    Condition, DynIden, Expr, IntoValueTuple, Order, SeaRc, SelectStatement, SimpleExpr, Value,
-    ValueTuple,
+    Condition, DynIden, Expr, ExprTrait, IntoValueTuple, Order, SeaRc, SelectStatement, SimpleExpr,
+    Value, ValueTuple,
 };
 use std::marker::PhantomData;
 use strum::IntoEnumIterator as Iterable;

src/query/helper.rs

@@ -3,8 +3,8 @@ use crate::{
     ModelTrait, PrimaryKeyToColumn, RelationDef,
 };
 use sea_query::{
-    Alias, Expr, Iden, IntoCondition, IntoIden, LockBehavior, LockType, NullOrdering, SeaRc,
-    SelectExpr, SelectStatement, SimpleExpr, TableRef,
+    Alias, Expr, ExprTrait, Iden, IntoCondition, IntoIden, LockBehavior, LockType, NullOrdering,
+    SeaRc, SelectExpr, SelectStatement, SimpleExpr, TableRef,
 };
 pub use sea_query::{Condition, ConditionalStatement, DynIden, JoinType, Order, OrderedStatement};
 
@@ -284,7 +284,7 @@ pub trait QuerySelect: Sized {
 
     /// Add an AND HAVING expression
     /// ```
-    /// use sea_orm::{sea_query::{Alias, Expr}, entity::*, query::*, tests_cfg::cake, DbBackend};
+    /// use sea_orm::{sea_query::{Alias, Expr, ExprTrait}, entity::*, query::*, tests_cfg::cake, DbBackend};
     ///
     /// assert_eq!(
     ///     cake::Entity::find()
@@ -731,7 +731,7 @@ pub trait QueryFilter: Sized {
     /// Like above, but using the `ANY` operator. Postgres only.
     ///
     /// ```
-    /// use sea_orm::sea_query::{Expr, extension::postgres::PgFunc};
+    /// use sea_orm::sea_query::{Expr, ExprTrait, extension::postgres::PgFunc};
     /// use sea_orm::{DbBackend, entity::*, query::*, tests_cfg::cake};
     ///
     /// assert_eq!(
@@ -790,7 +790,7 @@ pub trait QueryFilter: Sized {
     ///
     /// A slightly more complex example.
     /// ```
-    /// use sea_orm::{entity::*, query::*, tests_cfg::cake, sea_query::Expr, DbBackend};
+    /// use sea_orm::{entity::*, query::*, tests_cfg::cake, sea_query::{Expr, ExprTrait}, DbBackend};
     ///
     /// assert_eq!(
     ///     cake::Entity::find()
@@ -815,7 +815,7 @@ pub trait QueryFilter: Sized {
     /// ```
     /// Use a sea_query expression
     /// ```
-    /// use sea_orm::{entity::*, query::*, sea_query::Expr, tests_cfg::fruit, DbBackend};
+    /// use sea_orm::{entity::*, query::*, sea_query::{Expr, ExprTrait}, tests_cfg::fruit, DbBackend};
     ///
     /// assert_eq!(
     ///     fruit::Entity::find()

src/query/join.rs

@@ -189,7 +189,7 @@ mod tests {
         RelationTrait,
     };
     use pretty_assertions::assert_eq;
-    use sea_query::{Alias, ConditionType, Expr, IntoCondition, JoinType};
+    use sea_query::{Alias, ConditionType, Expr, ExprTrait, IntoCondition, JoinType};
 
     #[test]
     fn join_1() {

src/query/loader.rs

@@ -3,7 +3,9 @@ use crate::{
     RelationType, Select, error::*,
 };
 use async_trait::async_trait;
-use sea_query::{ColumnRef, DynIden, Expr, IntoColumnRef, SimpleExpr, TableRef, ValueTuple};
+use sea_query::{
+    ColumnRef, DynIden, Expr, ExprTrait, IntoColumnRef, SimpleExpr, TableRef, ValueTuple,
+};
 use std::{
     collections::{HashMap, HashSet},
     str::FromStr,

src/query/select.rs

@@ -121,7 +121,7 @@ where
     C: ColumnTrait,
 {
     fn into_column_as_expr(self) -> SimpleExpr {
-        self.select_as(Expr::expr(self.as_column_ref().into_column_ref()))
+        self.select_as(Expr::new(self.as_column_ref().into_column_ref()))
     }
 }
 

src/tests_cfg/entity_linked.rs

@@ -1,5 +1,5 @@
 use crate::entity::prelude::*;
-use sea_query::{Expr, IntoCondition};
+use sea_query::{Expr, ExprTrait, IntoCondition};
 
 #[derive(Debug)]
 pub struct CakeToFilling;

tests/active_enum_tests.rs

@@ -13,6 +13,7 @@ use sea_orm::{
     entity::*,
     sea_query::{BinOper, Expr},
 };
+use sea_query::ExprTrait;
 
 #[sea_orm_macros::test]
 async fn main() -> Result<(), DbErr> {
@@ -141,10 +142,10 @@ pub async fn insert_active_enum(db: &DatabaseConnection) -> Result<(), DbErr> {
     assert_eq!(
         model,
         Entity::find()
-            .filter(
-                Expr::col(Column::Tea)
-                    .binary(BinOper::In, Expr::tuple([Tea::EverydayTea.as_enum()]))
-            )
+            .filter(Expr::col(Column::Tea).binary(
+                BinOper::In,
+                Expr::tuple([ActiveEnumTrait::as_enum(&Tea::EverydayTea)])
+            ))
             .one(db)
             .await?
             .unwrap()
@@ -173,10 +174,10 @@ pub async fn insert_active_enum(db: &DatabaseConnection) -> Result<(), DbErr> {
         model,
         Entity::find()
             .filter(Column::Tea.is_not_null())
-            .filter(
-                Expr::col(Column::Tea)
-                    .binary(BinOper::NotIn, Expr::tuple([Tea::BreakfastTea.as_enum()]))
-            )
+            .filter(Expr::col(Column::Tea).binary(
+                BinOper::NotIn,
+                Expr::tuple([ActiveEnumTrait::as_enum(&Tea::BreakfastTea)])
+            ))
             .one(db)
             .await?
             .unwrap()

tests/cursor_tests.rs

@@ -5,6 +5,7 @@ pub mod common;
 pub use common::{TestContext, features::*, setup::*};
 use pretty_assertions::assert_eq;
 use sea_orm::{DerivePartialModel, FromQueryResult, QuerySelect, Set, entity::prelude::*};
+use sea_query::ExprTrait;
 use serde_json::json;
 
 #[sea_orm_macros::test]

tests/dyn_table_name_tests.rs

@@ -8,7 +8,7 @@ use sea_orm::{
     DatabaseConnection, Delete, IntoActiveModel, Iterable, QueryTrait, Set, Update,
     entity::prelude::*,
 };
-use sea_query::{Expr, Query};
+use sea_query::{Expr, ExprTrait, Query};
 
 #[sea_orm_macros::test]
 async fn main() -> Result<(), DbErr> {

tests/enum_primary_key_tests.rs

@@ -10,6 +10,7 @@ use sea_orm::{
     entity::*,
     sea_query::{BinOper, Expr},
 };
+use sea_query::ExprTrait;
 
 #[sea_orm_macros::test]
 async fn main() -> Result<(), DbErr> {
@@ -106,10 +107,10 @@ pub async fn insert_teas(db: &DatabaseConnection) -> Result<(), DbErr> {
     assert_eq!(
         model,
         Entity::find()
-            .filter(
-                Expr::col(Column::Id)
-                    .binary(BinOper::In, Expr::tuple([Tea::EverydayTea.as_enum()]))
-            )
+            .filter(Expr::col(Column::Id).binary(
+                BinOper::In,
+                Expr::tuple([ActiveEnumTrait::as_enum(&Tea::EverydayTea)])
+            ))
             .one(db)
             .await?
             .unwrap()

tests/partial_model_tests.rs

@@ -5,6 +5,7 @@ use sea_orm::{
     DerivePartialModel, FromQueryResult, IntoActiveModel, JoinType, NotSet, QueryOrder,
     QuerySelect, Set, prelude::*, sea_query::Alias,
 };
+use sea_query::ExprTrait;
 
 use crate::common::TestContext;
 use common::bakery_chain::*;