Codegen without find_* helper fn

examples/cli/src/entity/cake.rs

@@ -71,13 +71,4 @@ impl Related<super::fruit::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_cake_filling(&self) -> Select<super::cake_filling::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-    pub fn find_fruit(&self) -> Select<super::fruit::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

examples/cli/src/entity/cake_filling.rs

@@ -78,13 +78,4 @@ impl Related<super::filling::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_cake(&self) -> Select<super::cake::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-    pub fn find_filling(&self) -> Select<super::filling::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

examples/cli/src/entity/filling.rs

@@ -63,10 +63,4 @@ impl Related<super::cake_filling::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_cake_filling(&self) -> Select<super::cake_filling::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

examples/cli/src/entity/fruit.rs

@@ -39,6 +39,7 @@ impl PrimaryKeyTrait for PrimaryKey {
 #[derive(Copy, Clone, Debug, EnumIter)]
 pub enum Relation {
     Cake,
+    Vendor,
 }
 
 impl ColumnTrait for Column {
@@ -59,6 +60,7 @@ impl RelationTrait for Relation {
                 .from(Column::CakeId)
                 .to(super::cake::Column::Id)
                 .into(),
+            Self::Vendor => Entity::has_many(super::vendor::Entity).into(),
         }
     }
 }
@@ -69,9 +71,9 @@ impl Related<super::cake::Entity> for Entity {
     }
 }
 
-impl Model {
+impl Related<super::vendor::Entity> for Entity {
-    pub fn find_cake(&self) -> Select<super::cake::Entity> {
+    fn to() -> RelationDef {
-        Entity::find_related().belongs_to::<Entity>(self)
+        Relation::Vendor.def()
     }
 }
 

examples/cli/src/entity/mod.rs

@@ -4,3 +4,4 @@ pub mod cake;
 pub mod cake_filling;
 pub mod filling;
 pub mod fruit;
+pub mod vendor;

examples/cli/src/entity/prelude.rs

@@ -4,3 +4,4 @@ pub use super::cake::Entity as Cake;
 pub use super::cake_filling::Entity as CakeFilling;
 pub use super::filling::Entity as Filling;
 pub use super::fruit::Entity as Fruit;
+pub use super::vendor::Entity as Vendor;

examples/cli/src/entity/vendor.rs

@@ -47,7 +47,7 @@ impl ColumnTrait for Column {
         match self {
             Self::Id => ColumnType::Integer.def(),
             Self::Name => ColumnType::String(Some(255u32)).def(),
-            Self::FruitId => ColumnType::Integer.def(),
+            Self::FruitId => ColumnType::Integer.def().null(),
         }
     }
 }
@@ -55,7 +55,7 @@ impl ColumnTrait for Column {
 impl RelationTrait for Relation {
     fn def(&self) -> RelationDef {
         match self {
-            Self::Fruit => Entity::has_one(super::fruit::Entity)
+            Self::Fruit => Entity::belongs_to(super::fruit::Entity)
                 .from(Column::FruitId)
                 .to(super::fruit::Column::Id)
                 .into(),
@@ -69,10 +69,4 @@ impl Related<super::fruit::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_fruit(&self) -> Select<super::fruit::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

examples/codegen/src/entity/cake.rs

@@ -53,14 +53,8 @@ impl ColumnTrait for Column {
 impl RelationTrait for Relation {
     fn def(&self) -> RelationDef {
         match self {
-            Self::CakeFilling => Entity::has_many(super::cake_filling::Entity)
+            Self::CakeFilling => Entity::has_many(super::cake_filling::Entity).into(),
-                .from(Column::Id)
+            Self::Fruit => Entity::has_many(super::fruit::Entity).into(),
-                .to(super::cake_filling::Column::CakeId)
-                .into(),
-            Self::Fruit => Entity::has_many(super::fruit::Entity)
-                .from(Column::Id)
-                .to(super::fruit::Column::CakeId)
-                .into(),
         }
     }
 }
@@ -77,13 +71,4 @@ impl Related<super::fruit::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_cake_filling(&self) -> Select<super::cake_filling::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-    pub fn find_fruit(&self) -> Select<super::fruit::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

examples/codegen/src/entity/cake_filling.rs

@@ -54,11 +54,11 @@ impl ColumnTrait for Column {
 impl RelationTrait for Relation {
     fn def(&self) -> RelationDef {
         match self {
-            Self::Cake => Entity::has_one(super::cake::Entity)
+            Self::Cake => Entity::belongs_to(super::cake::Entity)
                 .from(Column::CakeId)
                 .to(super::cake::Column::Id)
                 .into(),
-            Self::Filling => Entity::has_one(super::filling::Entity)
+            Self::Filling => Entity::belongs_to(super::filling::Entity)
                 .from(Column::FillingId)
                 .to(super::filling::Column::Id)
                 .into(),
@@ -78,13 +78,4 @@ impl Related<super::filling::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_cake(&self) -> Select<super::cake::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-    pub fn find_filling(&self) -> Select<super::filling::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

examples/codegen/src/entity/filling.rs

@@ -52,10 +52,7 @@ impl ColumnTrait for Column {
 impl RelationTrait for Relation {
     fn def(&self) -> RelationDef {
         match self {
-            Self::CakeFilling => Entity::has_many(super::cake_filling::Entity)
+            Self::CakeFilling => Entity::has_many(super::cake_filling::Entity).into(),
-                .from(Column::Id)
-                .to(super::cake_filling::Column::FillingId)
-                .into(),
         }
     }
 }
@@ -66,10 +63,4 @@ impl Related<super::cake_filling::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_cake_filling(&self) -> Select<super::cake_filling::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

examples/codegen/src/entity/fruit.rs

@@ -48,7 +48,7 @@ impl ColumnTrait for Column {
         match self {
             Self::Id => ColumnType::Integer.def(),
             Self::Name => ColumnType::String(Some(255u32)).def(),
-            Self::CakeId => ColumnType::Integer.def(),
+            Self::CakeId => ColumnType::Integer.def().null(),
         }
     }
 }
@@ -56,14 +56,11 @@ impl ColumnTrait for Column {
 impl RelationTrait for Relation {
     fn def(&self) -> RelationDef {
         match self {
-            Self::Cake => Entity::has_one(super::cake::Entity)
+            Self::Cake => Entity::belongs_to(super::cake::Entity)
                 .from(Column::CakeId)
                 .to(super::cake::Column::Id)
                 .into(),
-            Self::Vendor => Entity::has_many(super::vendor::Entity)
+            Self::Vendor => Entity::has_many(super::vendor::Entity).into(),
-                .from(Column::Id)
-                .to(super::vendor::Column::FruitId)
-                .into(),
         }
     }
 }
@@ -80,13 +77,4 @@ impl Related<super::vendor::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_cake(&self) -> Select<super::cake::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-    pub fn find_vendor(&self) -> Select<super::vendor::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

examples/codegen/src/entity/vendor.rs

@@ -47,7 +47,7 @@ impl ColumnTrait for Column {
         match self {
             Self::Id => ColumnType::Integer.def(),
             Self::Name => ColumnType::String(Some(255u32)).def(),
-            Self::FruitId => ColumnType::Integer.def(),
+            Self::FruitId => ColumnType::Integer.def().null(),
         }
     }
 }
@@ -55,7 +55,7 @@ impl ColumnTrait for Column {
 impl RelationTrait for Relation {
     fn def(&self) -> RelationDef {
         match self {
-            Self::Fruit => Entity::has_one(super::fruit::Entity)
+            Self::Fruit => Entity::belongs_to(super::fruit::Entity)
                 .from(Column::FruitId)
                 .to(super::fruit::Column::Id)
                 .into(),
@@ -69,10 +69,4 @@ impl Related<super::fruit::Entity> for Entity {
     }
 }
 
-impl Model {
-    pub fn find_fruit(&self) -> Select<super::fruit::Entity> {
-        Entity::find_related().belongs_to::<Entity>(self)
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

sea-orm-codegen/src/entity/writer.rs

@@ -117,7 +117,6 @@ impl EntityWriter {
         ];
         code_blocks.extend(Self::gen_impl_related(entity));
         code_blocks.extend(vec![
-            Self::gen_impl_model(entity),
             Self::gen_impl_active_model_behavior(),
         ]);
         code_blocks
@@ -256,18 +255,6 @@ impl EntityWriter {
             .collect()
     }
 
-    pub fn gen_impl_model(entity: &Entity) -> TokenStream {
-        let relation_ref_tables_snake_case = entity.get_relation_ref_tables_snake_case();
-        let relation_rel_find_helpers = entity.get_relation_rel_find_helpers();
-        quote! {
-            impl Model {
-                #(pub fn #relation_rel_find_helpers(&self) -> Select<super::#relation_ref_tables_snake_case::Entity> {
-                    Entity::find_related().belongs_to::<Entity>(self)
-                })*
-            }
-        }
-    }
-
     pub fn gen_impl_active_model_behavior() -> TokenStream {
         quote! {
             impl ActiveModelBehavior for ActiveModel {}