From 3141778f9f56058441690f6eef32bec83285ff18 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Wed, 24 Jan 2024 11:41:43 +0800 Subject: [PATCH] fmt --- src/schema/entity.rs | 5 ++++- tests/relational_tests.rs | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/schema/entity.rs b/src/schema/entity.rs index d7f32b56a5..b1963edc32 100644 --- a/src/schema/entity.rs +++ b/src/schema/entity.rs @@ -197,7 +197,10 @@ where { let orm_column_def = column.def(); let types = match orm_column_def.col_type { - ColumnType::Enum { ref name, ref variants } => match backend { + ColumnType::Enum { + ref name, + ref variants, + } => match backend { DbBackend::MySql => { let variants: Vec = variants.iter().map(|v| v.to_string()).collect(); ColumnType::custom(format!("ENUM('{}')", variants.join("', '")).as_str()) diff --git a/tests/relational_tests.rs b/tests/relational_tests.rs index 97696d144f..eaab4be9e8 100644 --- a/tests/relational_tests.rs +++ b/tests/relational_tests.rs @@ -6,7 +6,7 @@ use pretty_assertions::assert_eq; pub use rust_decimal::prelude::*; pub use rust_decimal_macros::dec; use sea_orm::{entity::*, query::*, DbErr, DerivePartialModel, FromQueryResult}; -use sea_query::{Expr, Func, SimpleExpr, Alias}; +use sea_query::{Alias, Expr, Func, SimpleExpr}; pub use uuid::Uuid; // Run the test locally: @@ -356,11 +356,31 @@ pub async fn group_by() { .column(customer::Column::Name) .column_as(order::Column::Total.count(), "number_orders"); if cfg!(feature = "sqlx-sqlite") { - select = select.column_as(Expr::expr(Expr::expr(Expr::col(order::Column::Total).cast_as(Alias::new("real"))).sum()).cast_as(Alias::new("text")), "total_spent") - .column_as(Expr::expr(Expr::expr(Expr::col(order::Column::Total).cast_as(Alias::new("real"))).min()).cast_as(Alias::new("text")), "min_spent") - .column_as(Expr::expr(Expr::expr(Expr::col(order::Column::Total).cast_as(Alias::new("real"))).max()).cast_as(Alias::new("text")), "max_spent"); + select = select + .column_as( + Expr::expr( + Expr::expr(Expr::col(order::Column::Total).cast_as(Alias::new("real"))).sum(), + ) + .cast_as(Alias::new("text")), + "total_spent", + ) + .column_as( + Expr::expr( + Expr::expr(Expr::col(order::Column::Total).cast_as(Alias::new("real"))).min(), + ) + .cast_as(Alias::new("text")), + "min_spent", + ) + .column_as( + Expr::expr( + Expr::expr(Expr::col(order::Column::Total).cast_as(Alias::new("real"))).max(), + ) + .cast_as(Alias::new("text")), + "max_spent", + ); } else { - select = select.column_as(order::Column::Total.sum(), "total_spent") + select = select + .column_as(order::Column::Total.sum(), "total_spent") .column_as(order::Column::Total.min(), "min_spent") .column_as(order::Column::Total.max(), "max_spent"); } @@ -488,11 +508,14 @@ pub async fn having() { .group_by(customer::Column::Name) .group_by(order::Column::Total); if cfg!(feature = "sqlx-sqlite") { - select = select.having(Expr::expr(Expr::col(order::Column::Total).cast_as(Alias::new("real"))).gt(dec!(90.00))); + select = select.having( + Expr::expr(Expr::col(order::Column::Total).cast_as(Alias::new("real"))).gt(dec!(90.00)), + ); } else { select = select.having(order::Column::Total.gt(dec!(90.00))); } - let results = select.into_model::() + let results = select + .into_model::() .all(&ctx.db) .await .unwrap();