From 5060890888fc38e4693eaa9a329cda1b7d2c69bd Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Fri, 3 Sep 2021 14:56:58 +0800 Subject: [PATCH] cargo +nightly fmt --- src/entity/base_entity.rs | 26 +++++++++----- src/entity/column.rs | 4 +-- src/executor/select.rs | 76 ++++++++++++++++++++++----------------- src/lib.rs | 6 ++-- src/query/insert.rs | 42 +++++++++++----------- src/query/update.rs | 2 +- 6 files changed, 86 insertions(+), 70 deletions(-) diff --git a/src/entity/base_entity.rs b/src/entity/base_entity.rs index 299849538..67f817a70 100644 --- a/src/entity/base_entity.rs +++ b/src/entity/base_entity.rs @@ -137,13 +137,18 @@ pub trait EntityTrait: EntityName { /// assert_eq!( /// db.into_transaction_log(), /// vec![ - /// Transaction::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#, vec![1u64.into()] - /// ), - /// Transaction::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, vec![] - /// ), - /// ]); + /// Transaction::from_sql_and_values( + /// DbBackend::Postgres, + /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#, + /// vec![1u64.into()] + /// ), + /// Transaction::from_sql_and_values( + /// DbBackend::Postgres, + /// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, + /// vec![] + /// ), + /// ] + /// ); /// ``` fn find() -> Select { Select::new() @@ -186,8 +191,11 @@ pub trait EntityTrait: EntityName { /// assert_eq!( /// db.into_transaction_log(), /// vec![Transaction::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "cake"."id" = $1"#, vec![11i32.into()] - /// )]); + /// DbBackend::Postgres, + /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "cake"."id" = $1"#, + /// vec![11i32.into()] + /// )] + /// ); /// ``` /// Find by composite key /// ``` diff --git a/src/entity/column.rs b/src/entity/column.rs index 611950f58..baaf190c0 100644 --- a/src/entity/column.rs +++ b/src/entity/column.rs @@ -103,7 +103,7 @@ pub trait ColumnTrait: IdenStatic + Iterable + FromStr { /// /// assert_eq!( /// cake::Entity::find() - /// .filter(cake::Column::Id.between(2,3)) + /// .filter(cake::Column::Id.between(2, 3)) /// .build(DbBackend::MySql) /// .to_string(), /// "SELECT `cake`.`id`, `cake`.`name` FROM `cake` WHERE `cake`.`id` BETWEEN 2 AND 3" @@ -121,7 +121,7 @@ pub trait ColumnTrait: IdenStatic + Iterable + FromStr { /// /// assert_eq!( /// cake::Entity::find() - /// .filter(cake::Column::Id.not_between(2,3)) + /// .filter(cake::Column::Id.not_between(2, 3)) /// .build(DbBackend::MySql) /// .to_string(), /// "SELECT `cake`.`id`, `cake`.`name` FROM `cake` WHERE `cake`.`id` NOT BETWEEN 2 AND 3" diff --git a/src/executor/select.rs b/src/executor/select.rs index 0a5163de0..ef30bb3d1 100644 --- a/src/executor/select.rs +++ b/src/executor/select.rs @@ -290,14 +290,15 @@ where /// /// # let _: Result<(), DbErr> = smol::block_on(async { /// # - /// let res: Vec = cake::Entity::find().from_raw_sql( - /// Statement::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#, vec![] - /// ) - /// ) - /// .into_model::() - /// .all(&db) - /// .await?; + /// let res: Vec = cake::Entity::find() + /// .from_raw_sql(Statement::from_sql_and_values( + /// DbBackend::Postgres, + /// r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#, + /// vec![], + /// )) + /// .into_model::() + /// .all(&db) + /// .await?; /// /// assert_eq!( /// res, @@ -318,11 +319,12 @@ where /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![ - /// Transaction::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#, vec![] - /// ), - /// ]); + /// vec![Transaction::from_sql_and_values( + /// DbBackend::Postgres, + /// r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#, + /// vec![] + /// ),] + /// ); /// ``` pub fn into_model(self) -> SelectorRaw> where @@ -407,22 +409,26 @@ where /// /// # let _: Result<(), DbErr> = smol::block_on(async { /// # - /// let _: Option = cake::Entity::find().from_raw_sql( - /// Statement::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "id" = $1"#, vec![1.into()] - /// ) - /// ).one(&db).await?; + /// let _: Option = cake::Entity::find() + /// .from_raw_sql(Statement::from_sql_and_values( + /// DbBackend::Postgres, + /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "id" = $1"#, + /// vec![1.into()], + /// )) + /// .one(&db) + /// .await?; /// # /// # Ok(()) /// # }); /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![ - /// Transaction::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "id" = $1"#, vec![1.into()] - /// ), - /// ]); + /// vec![Transaction::from_sql_and_values( + /// DbBackend::Postgres, + /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "id" = $1"#, + /// vec![1.into()] + /// ),] + /// ); /// ``` pub async fn one(self, db: &DatabaseConnection) -> Result, DbErr> { let row = db.query_one(self.stmt).await?; @@ -442,22 +448,26 @@ where /// /// # let _: Result<(), DbErr> = smol::block_on(async { /// # - /// let _: Vec = cake::Entity::find().from_raw_sql( - /// Statement::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, vec![] - /// ) - /// ).all(&db).await?; + /// let _: Vec = cake::Entity::find() + /// .from_raw_sql(Statement::from_sql_and_values( + /// DbBackend::Postgres, + /// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, + /// vec![], + /// )) + /// .all(&db) + /// .await?; /// # /// # Ok(()) /// # }); /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![ - /// Transaction::from_sql_and_values( - /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, vec![] - /// ), - /// ]); + /// vec![Transaction::from_sql_and_values( + /// DbBackend::Postgres, + /// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, + /// vec![] + /// ),] + /// ); /// ``` pub async fn all(self, db: &DatabaseConnection) -> Result, DbErr> { let rows = db.query_all(self.stmt).await?; diff --git a/src/lib.rs b/src/lib.rs index ee5bb8cb4..240220900 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -77,10 +77,8 @@ //! let fruits: Vec = cheese.find_related(Fruit).all(db).await?; //! //! // find related models (eager) -//! let cake_with_fruits: Vec<(cake::Model, Vec)> = Cake::find() -//! .find_with_related(Fruit) -//! .all(db) -//! .await?; +//! let cake_with_fruits: Vec<(cake::Model, Vec)> = +//! Cake::find().find_with_related(Fruit).all(db).await?; //! //! # Ok(()) //! # } diff --git a/src/query/insert.rs b/src/query/insert.rs index abd52b4ba..a65071e18 100644 --- a/src/query/insert.rs +++ b/src/query/insert.rs @@ -43,11 +43,11 @@ where /// /// assert_eq!( /// Insert::one(cake::Model { - /// id: 1, - /// name: "Apple Pie".to_owned(), - /// }) - /// .build(DbBackend::Postgres) - /// .to_string(), + /// id: 1, + /// name: "Apple Pie".to_owned(), + /// }) + /// .build(DbBackend::Postgres) + /// .to_string(), /// r#"INSERT INTO "cake" ("id", "name") VALUES (1, 'Apple Pie')"#, /// ); /// ``` @@ -57,11 +57,11 @@ where /// /// assert_eq!( /// Insert::one(cake::ActiveModel { - /// id: Unset(None), - /// name: Set("Apple Pie".to_owned()), - /// }) - /// .build(DbBackend::Postgres) - /// .to_string(), + /// id: Unset(None), + /// name: Set("Apple Pie".to_owned()), + /// }) + /// .build(DbBackend::Postgres) + /// .to_string(), /// r#"INSERT INTO "cake" ("name") VALUES ('Apple Pie')"#, /// ); /// ``` @@ -79,17 +79,17 @@ where /// /// assert_eq!( /// Insert::many(vec![ - /// cake::Model { - /// id: 1, - /// name: "Apple Pie".to_owned(), - /// }, - /// cake::Model { - /// id: 2, - /// name: "Orange Scone".to_owned(), - /// } - /// ]) - /// .build(DbBackend::Postgres) - /// .to_string(), + /// cake::Model { + /// id: 1, + /// name: "Apple Pie".to_owned(), + /// }, + /// cake::Model { + /// id: 2, + /// name: "Orange Scone".to_owned(), + /// } + /// ]) + /// .build(DbBackend::Postgres) + /// .to_string(), /// r#"INSERT INTO "cake" ("id", "name") VALUES (1, 'Apple Pie'), (2, 'Orange Scone')"#, /// ); /// ``` diff --git a/src/query/update.rs b/src/query/update.rs index 21fd39cb0..8cd66c37f 100644 --- a/src/query/update.rs +++ b/src/query/update.rs @@ -59,7 +59,7 @@ impl Update { /// Update many ActiveModel /// /// ``` - /// use sea_orm::{entity::*, query::*, tests_cfg::fruit, sea_query::Expr, DbBackend}; + /// use sea_orm::{entity::*, query::*, sea_query::Expr, tests_cfg::fruit, DbBackend}; /// /// assert_eq!( /// Update::many(fruit::Entity)