From 2e1371537abb9c836f550cf2a38054a7010bdd01 Mon Sep 17 00:00:00 2001
From: Chris Tsang <tyt2y7@gmail.com>
Date: Fri, 17 Sep 2021 15:03:23 +0800
Subject: [PATCH] Merge FromQueryResultExt into FromQueryResult

---
 src/entity/model.rs   | 15 +++------------
 src/entity/prelude.rs |  5 ++---
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/entity/model.rs b/src/entity/model.rs
index 25b46719..c6129ad7 100644
--- a/src/entity/model.rs
+++ b/src/entity/model.rs
@@ -28,20 +28,13 @@ pub trait ModelTrait: Clone + Send + Debug {
     }
 }
 
-pub trait FromQueryResult {
-    fn from_query_result(res: &QueryResult, pre: &str) -> Result<Self, DbErr>
-    where
-        Self: Sized;
+pub trait FromQueryResult: Sized {
+    fn from_query_result(res: &QueryResult, pre: &str) -> Result<Self, DbErr>;
 
-    fn from_query_result_optional(res: &QueryResult, pre: &str) -> Result<Option<Self>, DbErr>
-    where
-        Self: Sized,
-    {
+    fn from_query_result_optional(res: &QueryResult, pre: &str) -> Result<Option<Self>, DbErr> {
         Ok(Self::from_query_result(res, pre).ok())
     }
-}
 
-pub trait FromQueryResultExt: FromQueryResult + Sized {
     /// ```
     /// # #[cfg(feature = "mock")]
     /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend};
@@ -107,5 +100,3 @@ pub trait FromQueryResultExt: FromQueryResult + Sized {
         SelectorRaw::<SelectModel<Self>>::from_statement(stmt)
     }
 }
-
-impl<T: FromQueryResult> FromQueryResultExt for T {}
diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs
index 22cfeeb0..8d87a4b2 100644
--- a/src/entity/prelude.rs
+++ b/src/entity/prelude.rs
@@ -2,9 +2,8 @@ pub use crate::{
     error::*, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait, ColumnType,
     DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity,
     DeriveEntityModel, DeriveModel, DerivePrimaryKey, DeriveRelation, EntityName, EntityTrait,
-    EnumIter, ForeignKeyAction, FromQueryResultExt, Iden, IdenStatic, Linked, ModelTrait,
-    PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef,
-    RelationTrait, Select, Value,
+    EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked, ModelTrait, PrimaryKeyToColumn,
+    PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef, RelationTrait, Select, Value,
 };
 
 #[cfg(feature = "with-json")]