Fixup

SeaQL · Dec 14, 2023 · 8a29cba · 8a29cba
1 parent 91b6f79
commit 8a29cba
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 36 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,16 +5,12 @@ 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,23 +5,15 @@ 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/tests/active_enum_tests.rs b/tests/active_enum_tests.rs
@@ -113,6 +113,7 @@ pub async fn insert_active_enum(db: &DatabaseConnection) -> Result<(), DbErr> {
     // Equivalent to the above.
     let select_with_tea_in =
         Entity::find().filter(Column::Tea.is_in([Tea::EverydayTea, Tea::BreakfastTea]));
+    #[cfg(feature = "sqlx-postgres")]
     assert_eq!(
         select_with_tea_in
             .build(sea_orm::DatabaseBackend::Postgres)
@@ -145,6 +146,7 @@ pub async fn insert_active_enum(db: &DatabaseConnection) -> Result<(), DbErr> {
     let select_with_tea_not_in = Entity::find()
         .filter(Column::Tea.is_not_null())
         .filter(Column::Tea.is_not_in([Tea::BreakfastTea]));
+    #[cfg(feature = "sqlx-postgres")]
     assert_eq!(
         select_with_tea_not_in
             .build(sea_orm::DatabaseBackend::Postgres)