Refactor/fix clippy errors (#2056) (#2057)

* chore: add clippy config file * refactor: fix clippy errors and wornings of runtime-async-std-native-tls,sqlx-all * refactor: fix clippy errors and wornings of sqlx-sqlite, sqlx-mysql, sqlx-postgres * chore: format * refactor: fix clippy * fix: import path * refactor: fix clippy errors and wornings of sqlx-sqlite, sqlx-mysql, sqlx-postgres * fix: revert some space and comma removal * fix: revert some space and comma removal * refactor: add feature flag * fix: import path * test: remove mismatch feature flag * test: remove mismatch feature flag * chore: add proper feature flag * chore: remove feature flag * refactor: remove clippy.toml file * fix: re-export driver * fix: re-export JoinType * fix: remove feature flag * chore: add #[allow(unused_imports)] for driver Co-authored-by: Shogo Nakano <61229807+shogo-nakano-desu@users.noreply.github.com>
SeaQL · Jan 10, 2024 · f54683d · f54683d
1 parent 3dc66aa
commit f54683d
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 29 deletions.
diff --git a/sea-orm-macros/src/strum/helpers/mod.rs b/sea-orm-macros/src/strum/helpers/mod.rs
@@ -1,4 +1,3 @@
-pub use self::case_style::CaseStyleHelpers;
 pub use self::type_props::HasTypeProperties;
 pub use self::variant_props::HasStrumVariantProperties;
 

diff --git a/src/driver/mock.rs b/src/driver/mock.rs
@@ -117,6 +117,10 @@ impl MockDatabaseConnection {
     }
 
     /// Get the [DatabaseBackend](crate::DatabaseBackend) being used by the [MockDatabase]
+    ///
+    /// # Panics
+    ///
+    /// Will panic if the lock cannot be acquired.
     pub fn get_database_backend(&self) -> DbBackend {
         self.mocker
             .lock()

diff --git a/src/lib.rs b/src/lib.rs
@@ -345,6 +345,7 @@ pub mod tests_cfg;
 mod util;
 
 pub use database::*;
+#[allow(unused_imports)]
 pub use driver::*;
 pub use entity::*;
 pub use error::*;

diff --git a/src/query/combine.rs b/src/query/combine.rs
@@ -2,7 +2,6 @@ use crate::{
     ColumnTrait, EntityTrait, IdenStatic, Iterable, QueryTrait, Select, SelectTwo, SelectTwoMany,
 };
 use core::marker::PhantomData;
-pub use sea_query::JoinType;
 use sea_query::{Alias, ColumnRef, Iden, Order, SeaRc, SelectExpr, SelectStatement, SimpleExpr};
 
 macro_rules! select_def {

diff --git a/src/query/mod.rs b/src/query/mod.rs
@@ -15,7 +15,6 @@ pub use combine::{SelectA, SelectB};
 pub use delete::*;
 pub use helper::*;
 pub use insert::*;
-pub use join::*;
 #[cfg(feature = "with-json")]
 pub use json::*;
 pub use loader::*;

diff --git a/src/query/select.rs b/src/query/select.rs
@@ -1,7 +1,6 @@
 use crate::{ColumnTrait, EntityTrait, Iterable, QueryFilter, QueryOrder, QuerySelect, QueryTrait};
 use core::fmt::Debug;
 use core::marker::PhantomData;
-pub use sea_query::JoinType;
 use sea_query::{Expr, IntoColumnRef, SelectStatement, SimpleExpr};
 
 /// Defines a structure to perform select operations

diff --git a/tests/active_enum_tests.rs b/tests/active_enum_tests.rs
@@ -1,14 +1,15 @@
 pub mod common;
 
-use active_enum::Entity as ActiveEnum;
-use active_enum_child::Entity as ActiveEnumChild;
+use active_enum::Entity as ActiveEnumEntity;
 pub use common::{features::*, setup::*, TestContext};
 use pretty_assertions::assert_eq;
+#[cfg(feature = "sqlx-postgres")]
+use sea_orm::QueryTrait;
 use sea_orm::{
     entity::prelude::*,
     entity::*,
     sea_query::{BinOper, Expr},
-    ActiveEnum as ActiveEnumTrait, DatabaseConnection, QueryTrait,
+    ActiveEnum as ActiveEnumTrait, DatabaseConnection,
 };
 
 #[sea_orm_macros::test]
@@ -146,6 +147,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
@@ -162,6 +164,7 @@ pub async fn insert_active_enum(db: &DatabaseConnection) -> Result<(), DbErr> {
         ]
         .join(" ")
     );
+
     assert_eq!(model, select_with_tea_not_in.one(db).await?.unwrap());
 
     let res = model.delete(db).await?;
@@ -338,7 +341,7 @@ pub async fn find_related_active_enum(db: &DatabaseConnection) -> Result<(), DbE
         }]
     );
     assert_eq!(
-        ActiveEnum::find()
+        ActiveEnumEntity::find()
             .find_with_related(ActiveEnumChild)
             .all(db)
             .await?,
@@ -359,7 +362,7 @@ pub async fn find_related_active_enum(db: &DatabaseConnection) -> Result<(), DbE
         )]
     );
     assert_eq!(
-        ActiveEnum::find()
+        ActiveEnumEntity::find()
             .find_also_related(ActiveEnumChild)
             .all(db)
             .await?,
@@ -464,7 +467,7 @@ pub async fn find_linked_active_enum(db: &DatabaseConnection) -> Result<(), DbEr
         }]
     );
     assert_eq!(
-        ActiveEnum::find()
+        ActiveEnumEntity::find()
             .find_also_linked(active_enum::ActiveEnumChildLink)
             .all(db)
             .await?,
@@ -485,7 +488,7 @@ pub async fn find_linked_active_enum(db: &DatabaseConnection) -> Result<(), DbEr
         )]
     );
     assert_eq!(
-        ActiveEnum::find()
+        ActiveEnumEntity::find()
             .find_with_linked(active_enum::ActiveEnumChildLink)
             .all(db)
             .await?,
@@ -620,7 +623,7 @@ mod tests {
             .join(" ")
         );
 
-        let _select = ActiveEnum::find().find_also_related(ActiveEnumChild);
+        let _select = ActiveEnumEntity::find().find_also_related(ActiveEnumChild);
         #[cfg(any(feature = "sqlx-mysql", feature = "sqlx-sqlite"))]
         {
             assert_eq!(
@@ -707,7 +710,7 @@ mod tests {
             .join(" ")
         );
 
-        let _select = ActiveEnum::find().find_also_linked(active_enum::ActiveEnumChildLink);
+        let _select = ActiveEnumEntity::find().find_also_linked(active_enum::ActiveEnumChildLink);
         #[cfg(any(feature = "sqlx-mysql", feature = "sqlx-sqlite"))]
         {
             assert_eq!(

diff --git a/tests/common/features/json_vec.rs b/tests/common/features/json_vec.rs
@@ -22,11 +22,7 @@ impl TryGetableFromJson for StringVec {}
 
 impl From<StringVec> for Value {
     fn from(source: StringVec) -> Self {
-        sea_orm::Value::Json(
-            serde_json::to_value(&source)
-                .ok()
-                .map(|s| std::boxed::Box::new(s)),
-        )
+        sea_orm::Value::Json(serde_json::to_value(source).ok().map(std::boxed::Box::new))
     }
 }
 

diff --git a/tests/common/setup/mod.rs b/tests/common/setup/mod.rs
@@ -74,7 +74,6 @@ pub async fn tear_down(base_url: &str, db_name: &str) {
                 format!("DROP DATABASE IF EXISTS \"{db_name}\";"),
             ))
             .await;
-    } else {
     };
 }
 

diff --git a/tests/cursor_tests.rs b/tests/cursor_tests.rs
@@ -2,9 +2,7 @@ pub mod common;
 
 pub use common::{features::*, setup::*, TestContext};
 use pretty_assertions::assert_eq;
-use sea_orm::{
-    entity::prelude::*, DerivePartialModel, FromQueryResult, QueryOrder, QuerySelect, Set,
-};
+use sea_orm::{entity::prelude::*, DerivePartialModel, FromQueryResult, QuerySelect, Set};
 use serde_json::json;
 
 #[sea_orm_macros::test]
@@ -18,7 +16,7 @@ async fn main() -> Result<(), DbErr> {
     create_tables(&ctx.db).await?;
     create_insert_default(&ctx.db).await?;
     cursor_pagination(&ctx.db).await?;
-    schema::create_tables(&ctx.db).await?;
+    bakery_chain_schema::create_tables(&ctx.db).await?;
     create_baker_cake(&ctx.db).await?;
     cursor_related_pagination(&ctx.db).await?;
     ctx.delete().await;
@@ -281,7 +279,8 @@ pub async fn cursor_pagination(db: &DatabaseConnection) -> Result<(), DbErr> {
 }
 
 use common::bakery_chain::{
-    baker, bakery, cake, cakes_bakers, schema, Baker, Bakery, Cake, CakesBakers,
+    baker, bakery, cake, cakes_bakers, schema as bakery_chain_schema, Baker, Bakery, Cake,
+    CakesBakers,
 };
 
 fn bakery(i: i32) -> bakery::Model {
@@ -318,8 +317,6 @@ fn cakebaker(cake: char, baker: char) -> CakeBakerlite {
 }
 
 pub async fn create_baker_cake(db: &DatabaseConnection) -> Result<(), DbErr> {
-    use sea_orm::IntoActiveModel;
-
     let mut bakeries: Vec<bakery::ActiveModel> = vec![];
     // bakeries named from 1 to 10
     for i in 1..=10 {

diff --git a/tests/empty_insert_tests.rs b/tests/empty_insert_tests.rs
@@ -9,7 +9,6 @@ pub use sea_orm::{
 pub use crud::*;
 // use common::bakery_chain::*;
 use sea_orm::{DbConn, TryInsertResult};
-use sea_query::OnConflict;
 
 #[sea_orm_macros::test]
 #[cfg(any(
@@ -38,7 +37,7 @@ pub async fn test(db: &DbConn) {
 
     assert!(matches!(res, Ok(TryInsertResult::Inserted(_))));
 
-    let double_seaside_bakery = bakery::ActiveModel {
+    let _double_seaside_bakery = bakery::ActiveModel {
         name: Set("SeaSide Bakery".to_owned()),
         profit_margin: Set(10.4),
         id: Set(1),

diff --git a/tests/returning_tests.rs b/tests/returning_tests.rs
@@ -79,7 +79,7 @@ async fn main() -> Result<(), DbErr> {
     should_panic(expected = "Database backend doesn't support RETURNING")
 )]
 async fn update_many() {
-    pub use common::{features::*, setup::*, TestContext};
+    pub use common::{features::*, TestContext};
     use edit_log::*;
 
     let run = || async {
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,6 @@ pub async fn tear_down(base_url: &str, db_name: &str) { @@
                     format!("DROP DATABASE IF EXISTS \"{db_name}\";"),
                 ))
                 .await;
-        } else {
         };
     }
@@ Expand Down @@