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

DeriveRelation on empty Relation enum (#1019)

Browse Source
This commit is contained in:
Billy Chan 2022-09-25 10:17:39 +08:00 committed by GitHub
parent d77cf24e06
commit 6ba8e1b9f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/axum_example/entity/src/post.rs
View File

@ -14,13 +14,7 @@ pub struct Model {
pub text: String, pub text: String,
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {} pub enum Relation {}
impl RelationTrait for Relation {
fn def(&self) -> RelationDef {
panic!("No RelationDef")
}
}
impl ActiveModelBehavior for ActiveModel {} impl ActiveModelBehavior for ActiveModel {}

8
examples/graphql_example/entity/src/note.rs
View File

@ -13,15 +13,9 @@ pub struct Model {
pub text: String, pub text: String,
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {} pub enum Relation {}
impl RelationTrait for Relation {
fn def(&self) -> RelationDef {
panic!("No RelationDef")
}
}
impl ActiveModelBehavior for ActiveModel {} impl ActiveModelBehavior for ActiveModel {}
impl Entity { impl Entity {

8
issues/471/src/post.rs
View File

@ -14,13 +14,7 @@ pub struct Model {
pub text: String, pub text: String,
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {} pub enum Relation {}
impl RelationTrait for Relation {
fn def(&self) -> RelationDef {
panic!("No RelationDef")
}
}
impl ActiveModelBehavior for ActiveModel {} impl ActiveModelBehavior for ActiveModel {}

8
issues/630/src/entity/underscores.rs
View File

@ -15,15 +15,9 @@ pub struct Model {
pub aa_b_c_d: i32, pub aa_b_c_d: i32,
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {} pub enum Relation {}
impl RelationTrait for Relation {
fn def(&self) -> RelationDef {
panic!("No RelationDef")
}
}
impl ActiveModelBehavior for ActiveModel {} impl ActiveModelBehavior for ActiveModel {}
#[cfg(test)] #[cfg(test)]

8
issues/630/src/entity/underscores_workaround.rs
View File

@ -20,15 +20,9 @@ pub struct Model {
pub aa_b_c_d: i32, pub aa_b_c_d: i32,
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {} pub enum Relation {}
impl RelationTrait for Relation {
fn def(&self) -> RelationDef {
panic!("No RelationDef")
}
}
impl ActiveModelBehavior for ActiveModel {} impl ActiveModelBehavior for ActiveModel {}
#[cfg(test)] #[cfg(test)]

10
sea-orm-codegen/src/entity/writer.rs
View File

@ -282,16 +282,8 @@ impl EntityWriter {
let mut code_blocks = vec![ let mut code_blocks = vec![
imports, imports,
Self::gen_compact_model_struct(entity, with_serde, date_time_crate, schema_name), Self::gen_compact_model_struct(entity, with_serde, date_time_crate, schema_name),
Self::gen_compact_relation_enum(entity),
]; ];
let relation_defs = if entity.get_relation_enum_name().is_empty() {
vec![
Self::gen_relation_enum(entity),
Self::gen_impl_relation_trait(entity),
]
} else {
vec![Self::gen_compact_relation_enum(entity)]
};
code_blocks.extend(relation_defs);
code_blocks.extend(Self::gen_impl_related(entity)); code_blocks.extend(Self::gen_impl_related(entity));
code_blocks.extend(Self::gen_impl_conjunct_related(entity)); code_blocks.extend(Self::gen_impl_conjunct_related(entity));
code_blocks.extend(vec![Self::gen_impl_active_model_behavior()]); code_blocks.extend(vec![Self::gen_impl_active_model_behavior()]);

8
sea-orm-codegen/tests/compact/filling.rs
View File

@ -10,15 +10,9 @@ pub struct Model {
pub name: String, pub name: String,
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {} pub enum Relation {}
impl RelationTrait for Relation {
fn def(&self) -> RelationDef {
panic!("No RelationDef")
}
}
impl Related<super::cake::Entity> for Entity { impl Related<super::cake::Entity> for Entity {
fn to() -> RelationDef { fn to() -> RelationDef {
super::cake_filling::Relation::Cake.def() super::cake_filling::Relation::Cake.def()

8
sea-orm-codegen/tests/compact_with_schema_name/filling.rs
View File

@ -10,15 +10,9 @@ pub struct Model {
pub name: String, pub name: String,
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {} pub enum Relation {}
impl RelationTrait for Relation {
fn def(&self) -> RelationDef {
panic!("No RelationDef")
}
}
impl Related<super::cake::Entity> for Entity { impl Related<super::cake::Entity> for Entity {
fn to() -> RelationDef { fn to() -> RelationDef {
super::cake_filling::Relation::Cake.def() super::cake_filling::Relation::Cake.def()

8
src/tests_cfg/lunch_set.rs
View File

@ -11,13 +11,7 @@ pub struct Model {
pub tea: Tea, pub tea: Tea,
} }
#[derive(Copy, Clone, Debug, EnumIter)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
pub enum Relation {} pub enum Relation {}
impl RelationTrait for Relation {
fn def(&self) -> RelationDef {
panic!("No RelationDef")
}
}
impl ActiveModelBehavior for ActiveModel {} impl ActiveModelBehavior for ActiveModel {}