Improve working with raw SQL

- Add `find_by_statement` to `T: FromQueryResult`
- Add `SelectorRaw::from_statement` constructor

src/database/statement.rs

@@ -1,4 +1,4 @@
-use crate::{DbBackend, FromQueryResult, SelectModel, SelectorRaw};
+use crate::DbBackend;
 use sea_query::{inject_parameters, MysqlQueryBuilder, PostgresQueryBuilder, SqliteQueryBuilder};
 pub use sea_query::{Value, Values};
 use std::fmt;
@@ -43,75 +43,6 @@ impl Statement {
             db_backend,
         }
     }
-
-    /// ```
-    /// # #[cfg(feature = "mock")]
-    /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend};
-    /// #
-    /// # let db = MockDatabase::new(DbBackend::Postgres)
-    /// #     .append_query_results(vec![vec![
-    /// #         maplit::btreemap! {
-    /// #             "name" => Into::<Value>::into("Chocolate Forest"),
-    /// #             "num_of_cakes" => Into::<Value>::into(1),
-    /// #         },
-    /// #         maplit::btreemap! {
-    /// #             "name" => Into::<Value>::into("New York Cheese"),
-    /// #             "num_of_cakes" => Into::<Value>::into(1),
-    /// #         },
-    /// #     ]])
-    /// #     .into_connection();
-    /// #
-    /// use sea_orm::{entity::*, query::*, tests_cfg::cake, FromQueryResult};
-    ///
-    /// #[derive(Debug, PartialEq, FromQueryResult)]
-    /// struct SelectResult {
-    ///     name: String,
-    ///     num_of_cakes: i32,
-    /// }
-    ///
-    /// # let _: Result<(), DbErr> = smol::block_on(async {
-    /// #
-    /// let res: Vec<SelectResult> = Statement::from_sql_and_values(
-    ///     DbBackend::Postgres,
-    ///     r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#,
-    ///     vec![],
-    /// )
-    /// .into_model::<SelectResult>()
-    /// .all(&db)
-    /// .await?;
-    ///
-    /// assert_eq!(
-    ///     res,
-    ///     vec![
-    ///         SelectResult {
-    ///             name: "Chocolate Forest".to_owned(),
-    ///             num_of_cakes: 1,
-    ///         },
-    ///         SelectResult {
-    ///             name: "New York Cheese".to_owned(),
-    ///             num_of_cakes: 1,
-    ///         },
-    ///     ]
-    /// );
-    /// #
-    /// # Ok(())
-    /// # });
-    ///
-    /// assert_eq!(
-    ///     db.into_transaction_log(),
-    ///     vec![Transaction::from_sql_and_values(
-    ///         DbBackend::Postgres,
-    ///         r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#,
-    ///         vec![]
-    ///     ),]
-    /// );
-    /// ```
-    pub fn into_model<M>(self) -> SelectorRaw<SelectModel<M>>
-    where
-        M: FromQueryResult,
-    {
-        SelectorRaw::<SelectModel<M>>::from_statement(self)
-    }
 }
 
 impl fmt::Display for Statement {

src/entity/model.rs

@@ -1,4 +1,7 @@
-use crate::{DbErr, EntityTrait, Linked, QueryFilter, QueryResult, Related, Select};
+use crate::{
+    DbErr, EntityTrait, Linked, QueryFilter, QueryResult, Related, Select, SelectModel,
+    SelectorRaw, Statement,
+};
 pub use sea_query::Value;
 use std::fmt::Debug;
 
@@ -37,3 +40,72 @@ pub trait FromQueryResult {
         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};
+    /// #
+    /// # let db = MockDatabase::new(DbBackend::Postgres)
+    /// #     .append_query_results(vec![vec![
+    /// #         maplit::btreemap! {
+    /// #             "name" => Into::<Value>::into("Chocolate Forest"),
+    /// #             "num_of_cakes" => Into::<Value>::into(1),
+    /// #         },
+    /// #         maplit::btreemap! {
+    /// #             "name" => Into::<Value>::into("New York Cheese"),
+    /// #             "num_of_cakes" => Into::<Value>::into(1),
+    /// #         },
+    /// #     ]])
+    /// #     .into_connection();
+    /// #
+    /// use sea_orm::{entity::*, query::*, tests_cfg::cake, FromQueryResult};
+    ///
+    /// #[derive(Debug, PartialEq, FromQueryResult)]
+    /// struct SelectResult {
+    ///     name: String,
+    ///     num_of_cakes: i32,
+    /// }
+    ///
+    /// # let _: Result<(), DbErr> = smol::block_on(async {
+    /// #
+    /// let res: Vec<SelectResult> = SelectResult::find_by_statement(Statement::from_sql_and_values(
+    ///     DbBackend::Postgres,
+    ///     r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#,
+    ///     vec![],
+    /// ))
+    /// .all(&db)
+    /// .await?;
+    ///
+    /// assert_eq!(
+    ///     res,
+    ///     vec![
+    ///         SelectResult {
+    ///             name: "Chocolate Forest".to_owned(),
+    ///             num_of_cakes: 1,
+    ///         },
+    ///         SelectResult {
+    ///             name: "New York Cheese".to_owned(),
+    ///             num_of_cakes: 1,
+    ///         },
+    ///     ]
+    /// );
+    /// #
+    /// # Ok(())
+    /// # });
+    ///
+    /// assert_eq!(
+    ///     db.into_transaction_log(),
+    ///     vec![Transaction::from_sql_and_values(
+    ///         DbBackend::Postgres,
+    ///         r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#,
+    ///         vec![]
+    ///     ),]
+    /// );
+    /// ```
+    fn find_by_statement(stmt: Statement) -> SelectorRaw<SelectModel<Self>> {
+        SelectorRaw::<SelectModel<Self>>::from_statement(stmt)
+    }
+}
+
+impl<T: FromQueryResult> FromQueryResultExt for T {}

src/entity/prelude.rs

@@ -2,8 +2,9 @@ pub use crate::{
     error::*, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait, ColumnType,
     DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity,
     DeriveEntityModel, DeriveModel, DerivePrimaryKey, DeriveRelation, EntityName, EntityTrait,
-    EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked, ModelTrait, PrimaryKeyToColumn,
+    EnumIter, ForeignKeyAction, FromQueryResultExt, Iden, IdenStatic, Linked, ModelTrait,
-    PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef, RelationTrait, Select, Value,
+    PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef,
+    RelationTrait, Select, Value,
 };
 
 #[cfg(feature = "with-json")]

src/executor/select.rs

@@ -263,11 +263,9 @@ impl<S> SelectorRaw<S>
 where
     S: SelectorTrait,
 {
-    // Create `SelectorRaw` from Statment. Executing this `SelectorRaw` will
+    /// Create `SelectorRaw` from Statment. Executing this `SelectorRaw` will
-    // return a type `M` which implement `FromQueryResult`.
+    /// return a type `M` which implement `FromQueryResult`.
-    //
+    pub fn from_statement<M>(stmt: Statement) -> SelectorRaw<SelectModel<M>>
-    // Helper function used by `Statment.into_model()`
-    pub(crate) fn from_statement<M>(stmt: Statement) -> SelectorRaw<SelectModel<M>>
     where
         M: FromQueryResult,
     {