Revert Unintended Formatting Changes SeaQL#2160

anshap1719 · Apr 26, 2024 · a349af0 · a349af0
1 parent 4bec02d
commit a349af0
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 35 deletions.
diff --git a/sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/bills.rs b/sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/bills.rs
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
-    pub user_id: Option<i32>,
+    pub user_id: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -15,7 +15,7 @@ pub enum Relation {
         from = "Column::UserId",
         to = "super::users::Column::Id",
         on_update = "NoAction",
-        on_delete = "NoAction"
+        on_delete = "NoAction",
     )]
     Users,
     #[sea_orm(has_many = "super::users_saved_bills::Entity")]

diff --git a/sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/users_saved_bills.rs b/sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/users_saved_bills.rs
@@ -16,15 +16,15 @@ pub enum Relation {
         from = "Column::BillId",
         to = "super::bills::Column::Id",
         on_update = "Cascade",
-        on_delete = "Cascade"
+        on_delete = "Cascade",
     )]
     Bills,
     #[sea_orm(
         belongs_to = "super::users::Entity",
         from = "Column::UserId",
         to = "super::users::Column::Id",
         on_update = "Cascade",
-        on_delete = "Cascade"
+        on_delete = "Cascade",
     )]
     Users,
 }

diff --git a/sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/users_votes.rs b/sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/users_votes.rs
@@ -17,15 +17,15 @@ pub enum Relation {
         from = "Column::BillId",
         to = "super::bills::Column::Id",
         on_update = "Cascade",
-        on_delete = "Cascade"
+        on_delete = "Cascade",
     )]
     Bills,
     #[sea_orm(
         belongs_to = "super::users::Entity",
         from = "Column::UserId",
         to = "super::users::Column::Id",
         on_update = "Cascade",
-        on_delete = "Cascade"
+        on_delete = "Cascade",
     )]
     Users,
 }

diff --git a/sea-orm-codegen/src/tests_cfg/many_to_many/bills.rs b/sea-orm-codegen/src/tests_cfg/many_to_many/bills.rs
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
-    pub user_id: Option<i32>,
+    pub user_id: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -15,7 +15,7 @@ pub enum Relation {
         from = "Column::UserId",
         to = "super::users::Column::Id",
         on_update = "NoAction",
-        on_delete = "NoAction"
+        on_delete = "NoAction",
     )]
     Users,
     #[sea_orm(has_many = "super::users_votes::Entity")]

diff --git a/sea-orm-codegen/src/tests_cfg/many_to_many/users_votes.rs b/sea-orm-codegen/src/tests_cfg/many_to_many/users_votes.rs
@@ -17,15 +17,15 @@ pub enum Relation {
         from = "Column::BillId",
         to = "super::bills::Column::Id",
         on_update = "Cascade",
-        on_delete = "Cascade"
+        on_delete = "Cascade",
     )]
     Bills,
     #[sea_orm(
         belongs_to = "super::users::Entity",
         from = "Column::UserId",
         to = "super::users::Column::Id",
         on_update = "Cascade",
-        on_delete = "Cascade"
+        on_delete = "Cascade",
     )]
     Users,
 }

diff --git a/sea-orm-codegen/src/tests_cfg/many_to_many_multiple/bills.rs b/sea-orm-codegen/src/tests_cfg/many_to_many_multiple/bills.rs
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
-    pub user_id: Option<i32>,
+    pub user_id: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -15,7 +15,7 @@ pub enum Relation {
         from = "Column::UserId",
         to = "super::users::Column::Id",
         on_update = "NoAction",
-        on_delete = "NoAction"
+        on_delete = "NoAction",
     )]
     Users,
 }

diff --git a/sea-orm-codegen/src/tests_cfg/many_to_many_multiple/users_votes.rs b/sea-orm-codegen/src/tests_cfg/many_to_many_multiple/users_votes.rs
@@ -7,8 +7,8 @@ pub struct Model {
     pub user_id: i32,
     #[sea_orm(primary_key, auto_increment = false)]
     pub bill_id: i32,
-    pub user_idd: Option<i32>,
-    pub bill_idd: Option<i32>,
+    pub user_idd: Option<i32> ,
+    pub bill_idd: Option<i32> ,
     pub vote: bool,
 }
 
@@ -17,25 +17,25 @@ pub enum Relation {
     #[sea_orm(
         belongs_to = "super::bills::Entity",
         from = "Column::BillIdd",
-        to = "super::bills::Column::Id"
+        to = "super::bills::Column::Id",
     )]
     Bills2,
     #[sea_orm(
         belongs_to = "super::bills::Entity",
         from = "Column::BillId",
-        to = "super::bills::Column::Id"
+        to = "super::bills::Column::Id",
     )]
     Bills1,
     #[sea_orm(
         belongs_to = "super::users::Entity",
         from = "Column::UserIdd",
-        to = "super::users::Column::Id"
+        to = "super::users::Column::Id",
     )]
     Users2,
     #[sea_orm(
         belongs_to = "super::users::Entity",
         from = "Column::UserId",
-        to = "super::users::Column::Id"
+        to = "super::users::Column::Id",
     )]
     Users1,
 }

diff --git a/sea-orm-codegen/src/tests_cfg/self_referencing/bills.rs b/sea-orm-codegen/src/tests_cfg/self_referencing/bills.rs
@@ -5,12 +5,16 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
-    pub self_id: Option<i32>,
+    pub self_id: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
-    #[sea_orm(belongs_to = "Entity", from = "Column::SelfId", to = "Column::Id")]
+    #[sea_orm(
+        belongs_to = "Entity",
+        from = "Column::SelfId",
+        to = "Column::Id",
+    )]
     SelfRef,
 }
 

diff --git a/sea-orm-codegen/src/tests_cfg/self_referencing/users.rs b/sea-orm-codegen/src/tests_cfg/self_referencing/users.rs
@@ -5,15 +5,23 @@ use sea_orm::entity::prelude::*;
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
-    pub self_id: Option<i32>,
-    pub self_idd: Option<i32>,
+    pub self_id: Option<i32> ,
+    pub self_idd: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
-    #[sea_orm(belongs_to = "Entity", from = "Column::SelfId", to = "Column::Id")]
+    #[sea_orm(
+        belongs_to = "Entity",
+        from = "Column::SelfId",
+        to = "Column::Id",
+    )]
     SelfRef2,
-    #[sea_orm(belongs_to = "Entity", from = "Column::SelfIdd", to = "Column::Id")]
+    #[sea_orm(
+        belongs_to = "Entity",
+        from = "Column::SelfIdd",
+        to = "Column::Id",
+    )]
     SelfRef1,
 }
 

diff --git a/sea-orm-codegen/tests/compact/vendor.rs b/sea-orm-codegen/tests/compact/vendor.rs
@@ -10,15 +10,15 @@ pub struct Model {
     #[sea_orm(column_name = "_name_")]
     pub name: String,
     #[sea_orm(column_name = "fruitId")]
-    pub fruit_id: Option<i32>,
+    pub fruit_id: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
         belongs_to = "super::fruit::Entity",
         from = "Column::FruitId",
-        to = "super::fruit::Column::Id"
+        to = "super::fruit::Column::Id",
     )]
     Fruit,
 }

diff --git a/sea-orm-codegen/tests/compact_with_schema_name/vendor.rs b/sea-orm-codegen/tests/compact_with_schema_name/vendor.rs
@@ -10,15 +10,15 @@ pub struct Model {
     #[sea_orm(column_name = "_name_")]
     pub name: String,
     #[sea_orm(column_name = "fruitId")]
-    pub fruit_id: Option<i32>,
+    pub fruit_id: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
         belongs_to = "super::fruit::Entity",
         from = "Column::FruitId",
-        to = "super::fruit::Column::Id"
+        to = "super::fruit::Column::Id",
     )]
     Fruit,
 }

diff --git a/sea-orm-codegen/tests/compact_with_serde/cake_serialize_with_hidden_column.rs b/sea-orm-codegen/tests/compact_with_serde/cake_serialize_with_hidden_column.rs
@@ -1,6 +1,6 @@
 //! SeaORM Entity. Generated by sea-orm-codegen 0.1.0
 
-use sea_orm::entity::prelude::*;
+use sea_orm::entity::prelude:: * ;
 use serde::Serialize;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize)]
@@ -10,7 +10,7 @@ pub struct Model {
     pub id: i32,
     #[sea_orm(column_name = "_name", column_type = "Text", nullable)]
     #[serde(skip)]
-    pub name: Option<String>,
+    pub name: Option<String> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

diff --git a/sea-orm-codegen/tests/expanded/vendor.rs b/sea-orm-codegen/tests/expanded/vendor.rs
@@ -15,7 +15,7 @@ impl EntityName for Entity {
 pub struct Model {
     pub id: i32,
     pub name: String,
-    pub fruit_id: Option<i32>,
+    pub fruit_id: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]

diff --git a/sea-orm-codegen/tests/expanded_with_schema_name/vendor.rs b/sea-orm-codegen/tests/expanded_with_schema_name/vendor.rs
@@ -6,7 +6,7 @@ use sea_orm::entity::prelude::*;
 pub struct Entity;
 
 impl EntityName for Entity {
-    fn schema_name(&self) -> Option<&str> {
+    fn schema_name(&self) -> Option< &str > {
         Some("schema_name")
     }
 
@@ -19,7 +19,7 @@ impl EntityName for Entity {
 pub struct Model {
     pub id: i32,
     pub name: String,
-    pub fruit_id: Option<i32>,
+    pub fruit_id: Option<i32> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]

diff --git a/sea-orm-codegen/tests/expanded_with_serde/cake_serialize_with_hidden_column.rs b/sea-orm-codegen/tests/expanded_with_serde/cake_serialize_with_hidden_column.rs
@@ -1,6 +1,6 @@
 //! SeaORM Entity. Generated by sea-orm-codegen 0.1.0
 
-use sea_orm::entity::prelude::*;
+use sea_orm::entity::prelude:: * ;
 use serde::Serialize;
 
 #[derive(Copy, Clone, Default, Debug, DeriveEntity)]
@@ -16,7 +16,7 @@ impl EntityName for Entity {
 pub struct Model {
     pub id: i32,
     #[serde(skip)]
-    pub name: Option<String>,
+    pub name: Option<String> ,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]