caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use SeaQL/strum

Browse Source
This commit is contained in:
Chris Tsang 2021-07-01 21:07:23 +08:00
parent 2f456d972f
commit e40455e771
10 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -35,8 +35,7 @@ sea-query = { version = "^0.12" }
sea-orm-macros = { path = "sea-orm-macros", optional = true } sea-orm-macros = { path = "sea-orm-macros", optional = true }
serde = { version = "^1.0", features = [ "derive" ] } serde = { version = "^1.0", features = [ "derive" ] }
sqlx = { version = "^0.5", optional = true } sqlx = { version = "^0.5", optional = true }
# strum = { path = "../strum/strum", version = "^0.21", features = [ "derive" ] } strum = { git = "https://github.com/SeaQL/strum.git", branch = "sea-orm", version = "^0.21", features = [ "derive", "sea-orm" ] }
strum = { git = "https://github.com/billy1624/strum.git", branch = "re-export-macros", version = "^0.21", features = [ "derive" ] }
serde_json = { version = "^1", optional = true } serde_json = { version = "^1", optional = true }
[dev-dependencies] [dev-dependencies]

2
examples/sqlx-mysql/Cargo.toml
View File

@ -6,7 +6,7 @@ publish = false
[dependencies] [dependencies]
async-std = { version = "^1.9", features = [ "attributes" ] } 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 } sea-orm = { path = "../../", features = [ "sqlx-mysql", "runtime-async-std-native-tls", "debug-print", "sqlx-json", "macros" ], default-features = false }
serde_json = { version = "^1" } serde_json = { version = "^1" }
futures = { version = "^0.3" } futures = { version = "^0.3" }
async-stream = { version = "^0.3" } async-stream = { version = "^0.3" }

3
examples/sqlx-mysql/src/example_cake.rs
View File

@ -16,14 +16,12 @@ pub struct Model {
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Column { pub enum Column {
Id, Id,
Name, Name,
} }
#[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)] #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
#[strum(crate_path = "sea_orm::strum")]
pub enum PrimaryKey { pub enum PrimaryKey {
Id, Id,
} }
@ -35,7 +33,6 @@ impl PrimaryKeyTrait for PrimaryKey {
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Relation { pub enum Relation {
Fruit, Fruit,
} }

3
examples/sqlx-mysql/src/example_cake_filling.rs
View File

@ -16,14 +16,12 @@ pub struct Model {
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Column { pub enum Column {
CakeId, CakeId,
FillingId, FillingId,
} }
#[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)] #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
#[strum(crate_path = "sea_orm::strum")]
pub enum PrimaryKey { pub enum PrimaryKey {
CakeId, CakeId,
FillingId, FillingId,
@ -36,7 +34,6 @@ impl PrimaryKeyTrait for PrimaryKey {
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Relation { pub enum Relation {
Cake, Cake,
Filling, Filling,

3
examples/sqlx-mysql/src/example_filling.rs
View File

@ -16,14 +16,12 @@ pub struct Model {
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Column { pub enum Column {
Id, Id,
Name, Name,
} }
#[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)] #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
#[strum(crate_path = "sea_orm::strum")]
pub enum PrimaryKey { pub enum PrimaryKey {
Id, Id,
} }
@ -35,7 +33,6 @@ impl PrimaryKeyTrait for PrimaryKey {
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Relation {} pub enum Relation {}
impl ColumnTrait for Column { impl ColumnTrait for Column {

3
examples/sqlx-mysql/src/example_fruit.rs
View File

@ -17,7 +17,6 @@ pub struct Model {
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Column { pub enum Column {
Id, Id,
Name, Name,
@ -25,7 +24,6 @@ pub enum Column {
} }
#[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)] #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
#[strum(crate_path = "sea_orm::strum")]
pub enum PrimaryKey { pub enum PrimaryKey {
Id, Id,
} }
@ -37,7 +35,6 @@ impl PrimaryKeyTrait for PrimaryKey {
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Relation { pub enum Relation {
Cake, Cake,
} }

3
src/tests_cfg/cake.rs
View File

@ -17,14 +17,12 @@ pub struct Model {
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Column { pub enum Column {
Id, Id,
Name, Name,
} }
#[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)] #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
#[strum(crate_path = "sea_orm::strum")]
pub enum PrimaryKey { pub enum PrimaryKey {
Id, Id,
} }
@ -36,7 +34,6 @@ impl PrimaryKeyTrait for PrimaryKey {
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Relation { pub enum Relation {
Fruit, Fruit,
} }

3
src/tests_cfg/cake_filling.rs
View File

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

3
src/tests_cfg/filling.rs
View File

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

3
src/tests_cfg/fruit.rs
View File

@ -18,7 +18,6 @@ pub struct Model {
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Column { pub enum Column {
Id, Id,
Name, Name,
@ -26,7 +25,6 @@ pub enum Column {
} }
#[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)] #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
#[strum(crate_path = "sea_orm::strum")]
pub enum PrimaryKey { pub enum PrimaryKey {
Id, Id,
} }
@ -38,7 +36,6 @@ impl PrimaryKeyTrait for PrimaryKey {
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter)]
#[strum(crate_path = "sea_orm::strum")]
pub enum Relation { pub enum Relation {
Cake, Cake,
} }