diff --git a/Cargo.toml b/Cargo.toml index 0eccf60dd..76672f35f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ tracing = { version = "0.1", features = ["log"] } rust_decimal = { version = "^1", optional = true } sea-orm-macros = { version = "^0.4.2", path = "sea-orm-macros", optional = true } sea-query = { version = "^0.20.0", features = ["thread-safe"] } -sea-strum = { version = "^0.21", features = ["derive", "sea-orm"] } +sea-strum = { version = "^0.23", features = ["derive", "sea-orm"] } serde = { version = "^1.0", features = ["derive"] } serde_json = { version = "^1", optional = true } sqlx = { version = "^0.5", optional = true } diff --git a/src/entity/base_entity.rs b/src/entity/base_entity.rs index 418b31306..f57683e4e 100644 --- a/src/entity/base_entity.rs +++ b/src/entity/base_entity.rs @@ -4,7 +4,7 @@ use crate::{ RelationTrait, RelationType, Select, Update, UpdateMany, UpdateOne, }; use sea_query::{Alias, Iden, IntoIden, IntoTableRef, IntoValueTuple, TableRef}; -pub use sea_strum::IntoEnumIterator as Iterable; +pub use strum::IntoEnumIterator as Iterable; use std::fmt::Debug; /// Ensure the identifier for an Entity can be converted to a static str diff --git a/src/executor/query.rs b/src/executor/query.rs index c76d7bcca..3a842fc01 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -388,7 +388,7 @@ pub trait TryGetableMany: Sized { /// ``` fn find_by_statement(stmt: Statement) -> SelectorRaw> where - C: sea_strum::IntoEnumIterator + sea_query::Iden, + C: strum::IntoEnumIterator + sea_query::Iden, { SelectorRaw::>::with_columns(stmt) } diff --git a/src/executor/select.rs b/src/executor/select.rs index 8d1d1b476..20067aceb 100644 --- a/src/executor/select.rs +++ b/src/executor/select.rs @@ -46,7 +46,7 @@ pub trait SelectorTrait { pub struct SelectGetableValue where T: TryGetableMany, - C: sea_strum::IntoEnumIterator + sea_query::Iden, + C: strum::IntoEnumIterator + sea_query::Iden, { columns: PhantomData, model: PhantomData, @@ -74,7 +74,7 @@ where impl SelectorTrait for SelectGetableValue where T: TryGetableMany, - C: sea_strum::IntoEnumIterator + sea_query::Iden, + C: strum::IntoEnumIterator + sea_query::Iden, { type Item = T; @@ -248,7 +248,7 @@ where pub fn into_values(self) -> Selector> where T: TryGetableMany, - C: sea_strum::IntoEnumIterator + sea_query::Iden, + C: strum::IntoEnumIterator + sea_query::Iden, { Selector::>::with_columns(self.query) } @@ -408,7 +408,7 @@ where pub fn with_columns(query: SelectStatement) -> Selector> where T: TryGetableMany, - C: sea_strum::IntoEnumIterator + sea_query::Iden, + C: strum::IntoEnumIterator + sea_query::Iden, { Selector { query, @@ -481,7 +481,7 @@ where pub fn with_columns(stmt: Statement) -> SelectorRaw> where T: TryGetableMany, - C: sea_strum::IntoEnumIterator + sea_query::Iden, + C: strum::IntoEnumIterator + sea_query::Iden, { SelectorRaw { stmt, diff --git a/src/lib.rs b/src/lib.rs index d1dde905e..422fe932c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -310,5 +310,5 @@ pub use sea_query::Iden; #[cfg(feature = "macros")] pub use sea_query::Iden as DeriveIden; -pub use sea_strum; -pub use sea_strum::EnumIter; +pub use strum; +pub use strum::EnumIter;