Re-export strum_macros

SeaQL · Jul 1, 2021 · 7bf79ae · 7bf79ae
1 parent 87c8d0d
commit 7bf79ae
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,7 @@ sea-query = { version = "^0.12" }
 sea-orm-macros = { path = "sea-orm-macros", optional = true }
 serde = { version = "^1.0", features = [ "derive" ] }
 sqlx = { version = "^0.5", optional = true }
-strum = { version = "^0.20", features = [ "derive" ] }
+strum = { path = "../strum/strum", version = "^0.21", features = [ "derive" ] }
 serde_json = { version = "^1", optional = true }
 
 [dev-dependencies]

diff --git a/examples/sqlx-mysql/Cargo.toml b/examples/sqlx-mysql/Cargo.toml
@@ -7,7 +7,6 @@ publish = false
 [dependencies]
 async-std = { version = "^1.9", features = [ "attributes" ] }
 sea-orm = { path = "../../", features = [ "sqlx-mysql", "runtime-async-std-native-tls", "debug-print", "with-json", "macros" ], default-features = false }
-strum = { version = "^0.20", features = [ "derive" ] }
 serde_json = { version = "^1" }
 futures = { version = "^0.3" }
 async-stream = { version = "^0.3" }

diff --git a/examples/sqlx-mysql/src/example_cake.rs b/examples/sqlx-mysql/src/example_cake.rs
@@ -16,12 +16,14 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -33,6 +35,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Fruit,
 }

diff --git a/examples/sqlx-mysql/src/example_cake_filling.rs b/examples/sqlx-mysql/src/example_cake_filling.rs
@@ -16,12 +16,14 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     CakeId,
     FillingId,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     CakeId,
     FillingId,
@@ -34,6 +36,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Cake,
     Filling,

diff --git a/examples/sqlx-mysql/src/example_filling.rs b/examples/sqlx-mysql/src/example_filling.rs
@@ -16,12 +16,14 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -33,6 +35,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {}
 
 impl ColumnTrait for Column {

diff --git a/examples/sqlx-mysql/src/example_fruit.rs b/examples/sqlx-mysql/src/example_fruit.rs
@@ -17,13 +17,15 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
     CakeId,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -35,6 +37,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Cake,
 }

diff --git a/src/lib.rs b/src/lib.rs
@@ -216,3 +216,4 @@ pub use sea_orm_macros::{
 pub use sea_query;
 pub use sea_query::Iden;
 pub use strum::EnumIter;
+pub use strum;
diff --git a/src/tests_cfg/cake.rs b/src/tests_cfg/cake.rs
@@ -17,12 +17,14 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -34,6 +36,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Fruit,
 }

diff --git a/src/tests_cfg/cake_filling.rs b/src/tests_cfg/cake_filling.rs
@@ -17,12 +17,14 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     CakeId,
     FillingId,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     CakeId,
     FillingId,
@@ -35,6 +37,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Cake,
     Filling,

diff --git a/src/tests_cfg/filling.rs b/src/tests_cfg/filling.rs
@@ -17,12 +17,14 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -34,6 +36,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {}
 
 impl ColumnTrait for Column {

diff --git a/src/tests_cfg/fruit.rs b/src/tests_cfg/fruit.rs
@@ -18,13 +18,15 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Column {
     Id,
     Name,
     CakeId,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum PrimaryKey {
     Id,
 }
@@ -36,6 +38,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter)]
+#[strum(crate_path = "sea_orm::strum")]
 pub enum Relation {
     Cake,
 }