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

Rename Transaction -> MockTransaction

Browse Source
This commit is contained in:
Chris Tsang 2021-10-04 20:44:29 +08:00
parent 6b98a6f395
commit df4df87d09
10 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/db_connection.rs
View File

@ -218,7 +218,7 @@ impl DatabaseConnection {
} }
} }
pub fn into_transaction_log(self) -> Vec<crate::Transaction> { pub fn into_transaction_log(self) -> Vec<crate::MockTransaction> {
let mut mocker = self.as_mock_connection().get_mocker_mutex().lock().unwrap(); let mut mocker = self.as_mock_connection().get_mocker_mutex().lock().unwrap();
mocker.drain_transaction_log() mocker.drain_transaction_log()
} }

18
src/database/mock.rs
View File

@ -9,7 +9,7 @@ use std::{collections::BTreeMap, sync::Arc};
#[derive(Debug)] #[derive(Debug)]
pub struct MockDatabase { pub struct MockDatabase {
db_backend: DbBackend, db_backend: DbBackend,
transaction_log: Vec<Transaction>, transaction_log: Vec<MockTransaction>,
exec_results: Vec<MockExecResult>, exec_results: Vec<MockExecResult>,
query_results: Vec<Vec<MockRow>>, query_results: Vec<Vec<MockRow>>,
} }
@ -30,7 +30,7 @@ pub trait IntoMockRow {
} }
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub struct Transaction { pub struct MockTransaction {
stmts: Vec<Statement>, stmts: Vec<Statement>,
} }
@ -67,7 +67,7 @@ impl MockDatabase {
impl MockDatabaseTrait for MockDatabase { impl MockDatabaseTrait for MockDatabase {
fn execute(&mut self, counter: usize, statement: Statement) -> Result<ExecResult, DbErr> { fn execute(&mut self, counter: usize, statement: Statement) -> Result<ExecResult, DbErr> {
self.transaction_log.push(Transaction::one(statement)); self.transaction_log.push(MockTransaction::one(statement));
if counter < self.exec_results.len() { if counter < self.exec_results.len() {
Ok(ExecResult { Ok(ExecResult {
result: ExecResultHolder::Mock(std::mem::take(&mut self.exec_results[counter])), result: ExecResultHolder::Mock(std::mem::take(&mut self.exec_results[counter])),
@ -78,7 +78,7 @@ impl MockDatabaseTrait for MockDatabase {
} }
fn query(&mut self, counter: usize, statement: Statement) -> Result<Vec<QueryResult>, DbErr> { fn query(&mut self, counter: usize, statement: Statement) -> Result<Vec<QueryResult>, DbErr> {
self.transaction_log.push(Transaction::one(statement)); self.transaction_log.push(MockTransaction::one(statement));
if counter < self.query_results.len() { if counter < self.query_results.len() {
Ok(std::mem::take(&mut self.query_results[counter]) Ok(std::mem::take(&mut self.query_results[counter])
.into_iter() .into_iter()
@ -91,7 +91,7 @@ impl MockDatabaseTrait for MockDatabase {
} }
} }
fn drain_transaction_log(&mut self) -> Vec<Transaction> { fn drain_transaction_log(&mut self) -> Vec<MockTransaction> {
std::mem::take(&mut self.transaction_log) std::mem::take(&mut self.transaction_log)
} }
@ -140,7 +140,7 @@ impl IntoMockRow for BTreeMap<&str, Value> {
} }
} }
impl Transaction { impl MockTransaction {
pub fn from_sql_and_values<I>(db_backend: DbBackend, sql: &str, values: I) -> Self pub fn from_sql_and_values<I>(db_backend: DbBackend, sql: &str, values: I) -> Self
where where
I: IntoIterator<Item = Value>, I: IntoIterator<Item = Value>,
@ -151,12 +151,12 @@ impl Transaction {
)) ))
} }
/// Create a Transaction with one statement /// Create a MockTransaction with one statement
pub fn one(stmt: Statement) -> Self { pub fn one(stmt: Statement) -> Self {
Self { stmts: vec![stmt] } Self { stmts: vec![stmt] }
} }
/// Create a Transaction with many statements /// Create a MockTransaction with many statements
pub fn many<I>(stmts: I) -> Self pub fn many<I>(stmts: I) -> Self
where where
I: IntoIterator<Item = Statement>, I: IntoIterator<Item = Statement>,
@ -166,7 +166,7 @@ impl Transaction {
} }
} }
/// Wrap each Statement as a single-statement Transaction /// Wrap each Statement as a single-statement MockTransaction
pub fn wrap<I>(stmts: I) -> Vec<Self> pub fn wrap<I>(stmts: I) -> Vec<Self>
where where
I: IntoIterator<Item = Statement>, I: IntoIterator<Item = Statement>,

10
src/docs.rs
View File

@ -3,7 +3,7 @@
//! Relying on [SQLx](https://github.com/launchbadge/sqlx), SeaORM is a new library with async support from day 1. //! Relying on [SQLx](https://github.com/launchbadge/sqlx), SeaORM is a new library with async support from day 1.
//! //!
//! ``` //! ```
//! # use sea_orm::{DbConn, error::*, entity::*, query::*, tests_cfg::*, DatabaseConnection, DbBackend, MockDatabase, Transaction, IntoMockRow}; //! # use sea_orm::{DbConn, error::*, entity::*, query::*, tests_cfg::*, DatabaseConnection, DbBackend, MockDatabase, MockTransaction, IntoMockRow};
//! # let db = MockDatabase::new(DbBackend::Postgres) //! # let db = MockDatabase::new(DbBackend::Postgres)
//! # .append_query_results(vec![ //! # .append_query_results(vec![
//! # vec![cake::Model { //! # vec![cake::Model {
@ -40,12 +40,12 @@
//! # assert_eq!( //! # assert_eq!(
//! # db.into_transaction_log(), //! # db.into_transaction_log(),
//! # vec![ //! # vec![
//! # Transaction::from_sql_and_values( //! # MockTransaction::from_sql_and_values(
//! # DbBackend::Postgres, //! # DbBackend::Postgres,
//! # r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, //! # r#"SELECT "cake"."id", "cake"."name" FROM "cake""#,
//! # vec![] //! # vec![]
//! # ), //! # ),
//! # Transaction::from_sql_and_values( //! # MockTransaction::from_sql_and_values(
//! # DbBackend::Postgres, //! # DbBackend::Postgres,
//! # r#"SELECT "fruit"."id", "fruit"."name", "fruit"."cake_id" FROM "fruit""#, //! # r#"SELECT "fruit"."id", "fruit"."name", "fruit"."cake_id" FROM "fruit""#,
//! # vec![] //! # vec![]
@ -88,7 +88,7 @@
//! Use mock connections to write unit tests for your logic. //! Use mock connections to write unit tests for your logic.
//! //!
//! ``` //! ```
//! # use sea_orm::{error::*, entity::*, query::*, tests_cfg::*, DbConn, MockDatabase, Transaction, DbBackend}; //! # use sea_orm::{error::*, entity::*, query::*, tests_cfg::*, DbConn, MockDatabase, MockTransaction, DbBackend};
//! # async fn function(db: DbConn) -> Result<(), DbErr> { //! # async fn function(db: DbConn) -> Result<(), DbErr> {
//! // Setup mock connection //! // Setup mock connection
//! let db = MockDatabase::new(DbBackend::Postgres) //! let db = MockDatabase::new(DbBackend::Postgres)
@ -115,7 +115,7 @@
//! assert_eq!( //! assert_eq!(
//! db.into_transaction_log(), //! db.into_transaction_log(),
//! vec![ //! vec![
//! Transaction::from_sql_and_values( //! MockTransaction::from_sql_and_values(
//! DbBackend::Postgres, //! DbBackend::Postgres,
//! r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#, //! r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#,
//! vec![1u64.into()] //! vec![1u64.into()]

6
src/driver/mock.rs
View File

@ -1,6 +1,6 @@
use crate::{ use crate::{
debug_print, error::*, DatabaseConnection, DbBackend, ExecResult, MockDatabase, QueryResult, debug_print, error::*, DatabaseConnection, DbBackend, ExecResult, MockDatabase,
Statement, Transaction, MockTransaction, QueryResult, Statement,
}; };
use futures::Stream; use futures::Stream;
use std::{ use std::{
@ -26,7 +26,7 @@ pub trait MockDatabaseTrait: Send + Debug {
fn query(&mut self, counter: usize, stmt: Statement) -> Result<Vec<QueryResult>, DbErr>; fn query(&mut self, counter: usize, stmt: Statement) -> Result<Vec<QueryResult>, DbErr>;
fn drain_transaction_log(&mut self) -> Vec<Transaction>; fn drain_transaction_log(&mut self) -> Vec<MockTransaction>;
fn get_database_backend(&self) -> DbBackend; fn get_database_backend(&self) -> DbBackend;
} }

38
src/entity/base_entity.rs
View File

@ -82,7 +82,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![ /// # .append_query_results(vec![
@ -137,12 +137,12 @@ pub trait EntityTrait: EntityName {
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![ /// vec![
/// Transaction::from_sql_and_values( /// MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#,
/// vec![1u64.into()] /// vec![1u64.into()]
/// ), /// ),
/// Transaction::from_sql_and_values( /// MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#,
/// vec![] /// vec![]
@ -160,7 +160,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![ /// # .append_query_results(vec![
@ -190,7 +190,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "cake"."id" = $1"#, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "cake"."id" = $1"#,
/// vec![11i32.into()] /// vec![11i32.into()]
@ -200,7 +200,7 @@ pub trait EntityTrait: EntityName {
/// Find by composite key /// Find by composite key
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![ /// # .append_query_results(vec![
@ -230,7 +230,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// [ /// [
/// r#"SELECT "cake_filling"."cake_id", "cake_filling"."filling_id" FROM "cake_filling""#, /// r#"SELECT "cake_filling"."cake_id", "cake_filling"."filling_id" FROM "cake_filling""#,
@ -262,7 +262,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_exec_results(vec![ /// # .append_exec_results(vec![
@ -292,7 +292,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, r#"INSERT INTO "cake" ("name") VALUES ($1) RETURNING "id""#, vec!["Apple Pie".into()] /// DbBackend::Postgres, r#"INSERT INTO "cake" ("name") VALUES ($1) RETURNING "id""#, vec!["Apple Pie".into()]
/// )]); /// )]);
/// ``` /// ```
@ -309,7 +309,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_exec_results(vec![ /// # .append_exec_results(vec![
@ -343,7 +343,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, r#"INSERT INTO "cake" ("name") VALUES ($1), ($2) RETURNING "id""#, /// DbBackend::Postgres, r#"INSERT INTO "cake" ("name") VALUES ($1), ($2) RETURNING "id""#,
/// vec!["Apple Pie".into(), "Orange Scone".into()] /// vec!["Apple Pie".into(), "Orange Scone".into()]
/// )]); /// )]);
@ -364,7 +364,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_exec_results(vec![ /// # .append_exec_results(vec![
@ -398,7 +398,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, r#"UPDATE "fruit" SET "name" = $1 WHERE "fruit"."id" = $2 AND "fruit"."name" LIKE $3"#, /// DbBackend::Postgres, r#"UPDATE "fruit" SET "name" = $1 WHERE "fruit"."id" = $2 AND "fruit"."name" LIKE $3"#,
/// vec!["Orange".into(), 1i32.into(), "%orange%".into()] /// vec!["Orange".into(), 1i32.into(), "%orange%".into()]
/// )]); /// )]);
@ -418,7 +418,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_exec_results(vec![ /// # .append_exec_results(vec![
@ -446,7 +446,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, r#"UPDATE "fruit" SET "cake_id" = $1 WHERE "fruit"."name" LIKE $2"#, vec![Value::Int(None), "%Apple%".into()] /// DbBackend::Postgres, r#"UPDATE "fruit" SET "cake_id" = $1 WHERE "fruit"."name" LIKE $2"#, vec![Value::Int(None), "%Apple%".into()]
/// )]); /// )]);
/// ``` /// ```
@ -462,7 +462,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_exec_results(vec![ /// # .append_exec_results(vec![
@ -491,7 +491,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, r#"DELETE FROM "fruit" WHERE "fruit"."id" = $1"#, vec![3i32.into()] /// DbBackend::Postgres, r#"DELETE FROM "fruit" WHERE "fruit"."id" = $1"#, vec![3i32.into()]
/// )]); /// )]);
/// ``` /// ```
@ -510,7 +510,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{entity::*, error::*, query::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # use sea_orm::{entity::*, error::*, query::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_exec_results(vec![ /// # .append_exec_results(vec![
@ -537,7 +537,7 @@ pub trait EntityTrait: EntityName {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, r#"DELETE FROM "fruit" WHERE "fruit"."name" LIKE $1"#, vec!["%Apple%".into()] /// DbBackend::Postgres, r#"DELETE FROM "fruit" WHERE "fruit"."name" LIKE $1"#, vec!["%Apple%".into()]
/// )]); /// )]);
/// ``` /// ```

4
src/entity/model.rs
View File

@ -38,7 +38,7 @@ pub trait FromQueryResult: Sized {
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![vec![ /// # .append_query_results(vec![vec![
@ -81,7 +81,7 @@ pub trait FromQueryResult: Sized {
/// # }); /// # });
/// # assert_eq!( /// # assert_eq!(
/// # db.into_transaction_log(), /// # db.into_transaction_log(),
/// # vec![Transaction::from_sql_and_values( /// # vec![MockTransaction::from_sql_and_values(
/// # DbBackend::Postgres, /// # DbBackend::Postgres,
/// # r#"SELECT "name", COUNT(*) AS "num_of_cakes" FROM "cake" GROUP BY("name")"#, /// # r#"SELECT "name", COUNT(*) AS "num_of_cakes" FROM "cake" GROUP BY("name")"#,
/// # vec![] /// # vec![]

12
src/executor/paginator.rs
View File

@ -158,7 +158,7 @@ where
mod tests { mod tests {
use crate::entity::prelude::*; use crate::entity::prelude::*;
use crate::{tests_cfg::*, ConnectionTrait}; use crate::{tests_cfg::*, ConnectionTrait};
use crate::{DatabaseConnection, DbBackend, MockDatabase, Transaction}; use crate::{DatabaseConnection, DbBackend, MockDatabase, MockTransaction};
use futures::TryStreamExt; use futures::TryStreamExt;
use sea_query::{Alias, Expr, SelectStatement, Value}; use sea_query::{Alias, Expr, SelectStatement, Value};
@ -228,7 +228,7 @@ mod tests {
query_builder.build(select.offset(4).limit(2)), query_builder.build(select.offset(4).limit(2)),
]; ];
assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts));
Ok(()) Ok(())
} }
@ -262,7 +262,7 @@ mod tests {
query_builder.build(select.offset(4).limit(2)), query_builder.build(select.offset(4).limit(2)),
]; ];
assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts));
Ok(()) Ok(())
} }
@ -294,7 +294,7 @@ mod tests {
let query_builder = db.get_database_backend(); let query_builder = db.get_database_backend();
let stmts = vec![query_builder.build(&select)]; let stmts = vec![query_builder.build(&select)];
assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts));
Ok(()) Ok(())
} }
@ -345,7 +345,7 @@ mod tests {
query_builder.build(select.offset(4).limit(2)), query_builder.build(select.offset(4).limit(2)),
]; ];
assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts));
Ok(()) Ok(())
} }
@ -377,7 +377,7 @@ mod tests {
query_builder.build(select.offset(4).limit(2)), query_builder.build(select.offset(4).limit(2)),
]; ];
assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts));
Ok(()) Ok(())
} }
} }

6
src/executor/query.rs
View File

@ -311,7 +311,7 @@ pub trait TryGetableMany: Sized {
/// ``` /// ```
/// # #[cfg(all(feature = "mock", feature = "macros"))] /// # #[cfg(all(feature = "mock", feature = "macros"))]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![vec![ /// # .append_query_results(vec![vec![
@ -326,7 +326,7 @@ pub trait TryGetableMany: Sized {
/// # ]]) /// # ]])
/// # .into_connection(); /// # .into_connection();
/// # /// #
/// use sea_orm::{entity::*, query::*, tests_cfg::cake, EnumIter, DeriveIden, TryGetableMany}; /// use sea_orm::{entity::*, query::*, tests_cfg::cake, DeriveIden, EnumIter, TryGetableMany};
/// ///
/// #[derive(EnumIter, DeriveIden)] /// #[derive(EnumIter, DeriveIden)]
/// enum ResultCol { /// enum ResultCol {
@ -358,7 +358,7 @@ pub trait TryGetableMany: Sized {
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#, /// r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#,
/// vec![] /// vec![]

24
src/executor/select.rs
View File

@ -132,7 +132,7 @@ where
/// ``` /// ```
/// # #[cfg(all(feature = "mock", feature = "macros"))] /// # #[cfg(all(feature = "mock", feature = "macros"))]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![vec![ /// # .append_query_results(vec![vec![
@ -171,7 +171,7 @@ where
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// r#"SELECT "cake"."name" AS "cake_name" FROM "cake""#, /// r#"SELECT "cake"."name" AS "cake_name" FROM "cake""#,
/// vec![] /// vec![]
@ -181,7 +181,7 @@ where
/// ///
/// ``` /// ```
/// # #[cfg(all(feature = "mock", feature = "macros"))] /// # #[cfg(all(feature = "mock", feature = "macros"))]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![vec![ /// # .append_query_results(vec![vec![
@ -221,7 +221,7 @@ where
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// vec![ /// vec![
/// r#"SELECT "cake"."name" AS "cake_name", COUNT("cake"."id") AS "num_of_cakes""#, /// r#"SELECT "cake"."name" AS "cake_name", COUNT("cake"."id") AS "num_of_cakes""#,
@ -521,7 +521,7 @@ where
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![vec![ /// # .append_query_results(vec![vec![
@ -575,7 +575,7 @@ where
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#, /// r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#,
/// vec![] /// vec![]
@ -594,7 +594,7 @@ where
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres) /// # let db = MockDatabase::new(DbBackend::Postgres)
/// # .append_query_results(vec![vec![ /// # .append_query_results(vec![vec![
@ -642,7 +642,7 @@ where
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![ /// vec![
/// Transaction::from_sql_and_values( /// MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, vec![] /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, vec![]
/// ), /// ),
/// ]); /// ]);
@ -657,7 +657,7 @@ where
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres).into_connection(); /// # let db = MockDatabase::new(DbBackend::Postgres).into_connection();
/// # /// #
@ -679,7 +679,7 @@ where
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "id" = $1"#, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "id" = $1"#,
/// vec![1.into()] /// vec![1.into()]
@ -699,7 +699,7 @@ where
/// ``` /// ```
/// # #[cfg(feature = "mock")] /// # #[cfg(feature = "mock")]
/// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend};
/// # /// #
/// # let db = MockDatabase::new(DbBackend::Postgres).into_connection(); /// # let db = MockDatabase::new(DbBackend::Postgres).into_connection();
/// # /// #
@ -721,7 +721,7 @@ where
/// ///
/// assert_eq!( /// assert_eq!(
/// db.into_transaction_log(), /// db.into_transaction_log(),
/// vec![Transaction::from_sql_and_values( /// vec![MockTransaction::from_sql_and_values(
/// DbBackend::Postgres, /// DbBackend::Postgres,
/// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#,
/// vec![] /// vec![]