From c72d7b0289e37640ef6c1707773d51434c886c01 Mon Sep 17 00:00:00 2001
From: Chris Tsang <tyt2y7@gmail.com>
Date: Sun, 9 May 2021 02:43:40 +0800
Subject: [PATCH] Rename

---
 src/entity/column.rs   |  2 +-
 src/entity/relation.rs | 10 +++++++---
 src/query/select.rs    |  8 ++++----
 src/tests_cfg/cake.rs  |  8 ++++----
 src/tests_cfg/fruit.rs |  4 ++--
 src/tests_cfg/mod.rs   |  2 +-
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/entity/column.rs b/src/entity/column.rs
index 79f1bec5..2e9073d2 100644
--- a/src/entity/column.rs
+++ b/src/entity/column.rs
@@ -18,7 +18,7 @@ macro_rules! bind_oper {
 pub trait ColumnTrait: Iden + Copy + Debug + 'static {
     type Entity: EntityTrait;
 
-    fn col_type(&self) -> ColumnType;
+    fn def(&self) -> ColumnType;
 
     fn entity_iden(&self) -> Rc<dyn Iden> {
         Rc::new(Self::Entity::default()) as Rc<dyn Iden>
diff --git a/src/entity/relation.rs b/src/entity/relation.rs
index bd9f2757..0a8b7bd8 100644
--- a/src/entity/relation.rs
+++ b/src/entity/relation.rs
@@ -11,17 +11,21 @@ pub enum RelationType {
 }
 
 pub trait RelationTrait: Debug + 'static {
-    fn rel_def(&self) -> RelationDef;
+    fn def(&self) -> RelationDef;
 }
 
 pub trait Related<R>
 where
     R: EntityTrait,
 {
-    fn via() -> RelationDef;
+    fn to() -> RelationDef;
+
+    fn via() -> Option<RelationDef> {
+        None
+    }
 
     fn find_related() -> Select<R> {
-        Select::<R>::new().prepare_reverse_join(Self::via())
+        Select::<R>::new().prepare_reverse_join(Self::to())
     }
 }
 
diff --git a/src/query/select.rs b/src/query/select.rs
index 856b3509..2bf027cd 100644
--- a/src/query/select.rs
+++ b/src/query/select.rs
@@ -120,22 +120,22 @@ where
     }
 
     pub fn left_join(self, rel: E::Relation) -> Self {
-        self.prepare_join(JoinType::LeftJoin, E::Relation::rel_def(&rel))
+        self.prepare_join(JoinType::LeftJoin, E::Relation::def(&rel))
     }
 
     pub fn right_join(self, rel: E::Relation) -> Self {
-        self.prepare_join(JoinType::RightJoin, E::Relation::rel_def(&rel))
+        self.prepare_join(JoinType::RightJoin, E::Relation::def(&rel))
     }
 
     pub fn inner_join(self, rel: E::Relation) -> Self {
-        self.prepare_join(JoinType::InnerJoin, E::Relation::rel_def(&rel))
+        self.prepare_join(JoinType::InnerJoin, E::Relation::def(&rel))
     }
 
     pub fn reverse_join<R>(self, rel: R) -> Self
     where
         R: RelationTrait,
     {
-        self.prepare_reverse_join(rel.rel_def())
+        self.prepare_reverse_join(rel.def())
     }
 
     /// Get a mutable ref to the query builder
diff --git a/src/tests_cfg/cake.rs b/src/tests_cfg/cake.rs
index fd5323b8..f3906711 100644
--- a/src/tests_cfg/cake.rs
+++ b/src/tests_cfg/cake.rs
@@ -48,7 +48,7 @@ impl ModelTrait for Model {
 impl ColumnTrait for Column {
     type Entity = Entity;
 
-    fn col_type(&self) -> ColumnType {
+    fn def(&self) -> ColumnType {
         match self {
             Self::Id => ColumnType::Integer(None),
             Self::Name => ColumnType::String(None),
@@ -57,7 +57,7 @@ impl ColumnTrait for Column {
 }
 
 impl RelationTrait for Relation {
-    fn rel_def(&self) -> RelationDef {
+    fn def(&self) -> RelationDef {
         match self {
             Self::Fruit => Entity::has_many(super::fruit::Entity)
                 .from(Column::Id)
@@ -68,8 +68,8 @@ impl RelationTrait for Relation {
 }
 
 impl Related<super::fruit::Entity> for Entity {
-    fn via() -> RelationDef {
-        Relation::Fruit.rel_def()
+    fn to() -> RelationDef {
+        Relation::Fruit.def()
     }
 }
 
diff --git a/src/tests_cfg/fruit.rs b/src/tests_cfg/fruit.rs
index 823e5c9d..3bdd40d4 100644
--- a/src/tests_cfg/fruit.rs
+++ b/src/tests_cfg/fruit.rs
@@ -49,7 +49,7 @@ impl ModelTrait for Model {
 impl ColumnTrait for Column {
     type Entity = Entity;
 
-    fn col_type(&self) -> ColumnType {
+    fn def(&self) -> ColumnType {
         match self {
             Self::Id => ColumnType::Integer(None),
             Self::Name => ColumnType::String(None),
@@ -59,7 +59,7 @@ impl ColumnTrait for Column {
 }
 
 impl RelationTrait for Relation {
-    fn rel_def(&self) -> RelationDef {
+    fn def(&self) -> RelationDef {
         panic!()
     }
 }
diff --git a/src/tests_cfg/mod.rs b/src/tests_cfg/mod.rs
index 20b6c91e..73f3b730 100644
--- a/src/tests_cfg/mod.rs
+++ b/src/tests_cfg/mod.rs
@@ -1,4 +1,4 @@
 //! Configurations for test cases and examples. Not intended for actual use.
 
 pub mod cake;
-pub mod fruit;
\ No newline at end of file
+pub mod fruit;