From a2ec6cd351c3de9f4ce54a20ea64630d66c77e9c Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Thu, 7 Oct 2021 17:58:34 +0800 Subject: [PATCH] Rename MockTransaction -> Transaction --- src/database/db_connection.rs | 2 +- src/database/mock.rs | 30 +++++++++++++-------------- src/docs.rs | 10 ++++----- src/driver/mock.rs | 4 ++-- src/entity/base_entity.rs | 38 +++++++++++++++++------------------ src/entity/model.rs | 4 ++-- src/executor/paginator.rs | 12 +++++------ src/executor/query.rs | 4 ++-- src/executor/select.rs | 24 +++++++++++----------- src/executor/update.rs | 10 ++++----- 10 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/database/db_connection.rs b/src/database/db_connection.rs index fff654a3..e8f37546 100644 --- a/src/database/db_connection.rs +++ b/src/database/db_connection.rs @@ -215,7 +215,7 @@ impl DatabaseConnection { } } - pub fn into_transaction_log(self) -> Vec { + pub fn into_transaction_log(self) -> Vec { let mut mocker = self.as_mock_connection().get_mocker_mutex().lock().unwrap(); mocker.drain_transaction_log() } diff --git a/src/database/mock.rs b/src/database/mock.rs index d1bb65a4..8ca39377 100644 --- a/src/database/mock.rs +++ b/src/database/mock.rs @@ -10,7 +10,7 @@ use std::{collections::BTreeMap, sync::Arc}; pub struct MockDatabase { db_backend: DbBackend, transaction: Option, - transaction_log: Vec, + transaction_log: Vec, exec_results: Vec, query_results: Vec>, } @@ -37,7 +37,7 @@ pub struct OpenTransaction { } #[derive(Debug, Clone, PartialEq)] -pub struct MockTransaction { +pub struct Transaction { stmts: Vec, } @@ -78,7 +78,7 @@ impl MockDatabaseTrait for MockDatabase { if let Some(transaction) = &mut self.transaction { transaction.push(statement); } else { - self.transaction_log.push(MockTransaction::one(statement)); + self.transaction_log.push(Transaction::one(statement)); } if counter < self.exec_results.len() { Ok(ExecResult { @@ -93,7 +93,7 @@ impl MockDatabaseTrait for MockDatabase { if let Some(transaction) = &mut self.transaction { transaction.push(statement); } else { - self.transaction_log.push(MockTransaction::one(statement)); + self.transaction_log.push(Transaction::one(statement)); } if counter < self.query_results.len() { Ok(std::mem::take(&mut self.query_results[counter]) @@ -119,7 +119,7 @@ impl MockDatabaseTrait for MockDatabase { if self.transaction.is_some() { let transaction = self.transaction.take().unwrap(); self.transaction_log - .push(transaction.into_mock_transaction()); + .push(transaction.into_transaction()); } else { panic!("There is no open transaction to commit"); } @@ -133,7 +133,7 @@ impl MockDatabaseTrait for MockDatabase { } } - fn drain_transaction_log(&mut self) -> Vec { + fn drain_transaction_log(&mut self) -> Vec { std::mem::take(&mut self.transaction_log) } @@ -182,7 +182,7 @@ impl IntoMockRow for BTreeMap<&str, Value> { } } -impl MockTransaction { +impl Transaction { pub fn from_sql_and_values(db_backend: DbBackend, sql: &str, values: I) -> Self where I: IntoIterator, @@ -193,12 +193,12 @@ impl MockTransaction { )) } - /// Create a MockTransaction with one statement + /// Create a Transaction with one statement pub fn one(stmt: Statement) -> Self { Self { stmts: vec![stmt] } } - /// Create a MockTransaction with many statements + /// Create a Transaction with many statements pub fn many(stmts: I) -> Self where I: IntoIterator, @@ -208,7 +208,7 @@ impl MockTransaction { } } - /// Wrap each Statement as a single-statement MockTransaction + /// Wrap each Statement as a single-statement Transaction pub fn wrap(stmts: I) -> Vec where I: IntoIterator, @@ -229,8 +229,8 @@ impl OpenTransaction { self.stmts.push(stmt); } - fn into_mock_transaction(self) -> MockTransaction { - MockTransaction { stmts: self.stmts } + fn into_transaction(self) -> Transaction { + Transaction { stmts: self.stmts } } } @@ -238,7 +238,7 @@ impl OpenTransaction { #[cfg(feature = "mock")] mod tests { use crate::{ - entity::*, tests_cfg::*, ConnectionTrait, DbBackend, DbErr, MockDatabase, MockTransaction, + entity::*, tests_cfg::*, ConnectionTrait, DbBackend, DbErr, MockDatabase, Transaction, Statement, }; @@ -262,7 +262,7 @@ mod tests { assert_eq!( db.into_transaction_log(), vec![ - MockTransaction::many(vec![ + Transaction::many(vec![ Statement::from_sql_and_values( DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#, @@ -274,7 +274,7 @@ mod tests { vec![] ), ]), - MockTransaction::from_sql_and_values( + Transaction::from_sql_and_values( DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, vec![] diff --git a/src/docs.rs b/src/docs.rs index ec8542a6..4d1226c3 100644 --- a/src/docs.rs +++ b/src/docs.rs @@ -3,7 +3,7 @@ //! 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, MockTransaction, IntoMockRow}; +//! # use sea_orm::{DbConn, error::*, entity::*, query::*, tests_cfg::*, DatabaseConnection, DbBackend, MockDatabase, Transaction, IntoMockRow}; //! # let db = MockDatabase::new(DbBackend::Postgres) //! # .append_query_results(vec![ //! # vec![cake::Model { @@ -40,12 +40,12 @@ //! # assert_eq!( //! # db.into_transaction_log(), //! # vec![ -//! # MockTransaction::from_sql_and_values( +//! # Transaction::from_sql_and_values( //! # DbBackend::Postgres, //! # r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, //! # vec![] //! # ), -//! # MockTransaction::from_sql_and_values( +//! # Transaction::from_sql_and_values( //! # DbBackend::Postgres, //! # r#"SELECT "fruit"."id", "fruit"."name", "fruit"."cake_id" FROM "fruit""#, //! # vec![] @@ -88,7 +88,7 @@ //! Use mock connections to write unit tests for your logic. //! //! ``` -//! # use sea_orm::{error::*, entity::*, query::*, tests_cfg::*, DbConn, MockDatabase, MockTransaction, DbBackend}; +//! # use sea_orm::{error::*, entity::*, query::*, tests_cfg::*, DbConn, MockDatabase, Transaction, DbBackend}; //! # async fn function(db: DbConn) -> Result<(), DbErr> { //! // Setup mock connection //! let db = MockDatabase::new(DbBackend::Postgres) @@ -115,7 +115,7 @@ //! assert_eq!( //! db.into_transaction_log(), //! vec![ -//! MockTransaction::from_sql_and_values( +//! Transaction::from_sql_and_values( //! DbBackend::Postgres, //! r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#, //! vec![1u64.into()] diff --git a/src/driver/mock.rs b/src/driver/mock.rs index d3c36262..b56ffa29 100644 --- a/src/driver/mock.rs +++ b/src/driver/mock.rs @@ -1,6 +1,6 @@ use crate::{ debug_print, error::*, DatabaseConnection, DbBackend, ExecResult, MockDatabase, - MockTransaction, QueryResult, Statement, + Transaction, QueryResult, Statement, }; use futures::Stream; use std::{ @@ -32,7 +32,7 @@ pub trait MockDatabaseTrait: Send + Debug { fn rollback(&mut self); - fn drain_transaction_log(&mut self) -> Vec; + fn drain_transaction_log(&mut self) -> Vec; fn get_database_backend(&self) -> DbBackend; } diff --git a/src/entity/base_entity.rs b/src/entity/base_entity.rs index 2a40c686..aef46207 100644 --- a/src/entity/base_entity.rs +++ b/src/entity/base_entity.rs @@ -82,7 +82,7 @@ pub trait EntityTrait: EntityName { /// /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![ @@ -137,12 +137,12 @@ pub trait EntityTrait: EntityName { /// assert_eq!( /// db.into_transaction_log(), /// vec![ - /// MockTransaction::from_sql_and_values( + /// Transaction::from_sql_and_values( /// DbBackend::Postgres, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" LIMIT $1"#, /// vec![1u64.into()] /// ), - /// MockTransaction::from_sql_and_values( + /// Transaction::from_sql_and_values( /// DbBackend::Postgres, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, /// vec![] @@ -160,7 +160,7 @@ pub trait EntityTrait: EntityName { /// /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![ @@ -190,7 +190,7 @@ pub trait EntityTrait: EntityName { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "cake"."id" = $1"#, /// vec![11i32.into()] @@ -200,7 +200,7 @@ pub trait EntityTrait: EntityName { /// Find by composite key /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![ @@ -230,7 +230,7 @@ pub trait EntityTrait: EntityName { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, /// [ /// r#"SELECT "cake_filling"."cake_id", "cake_filling"."filling_id" FROM "cake_filling""#, @@ -262,7 +262,7 @@ pub trait EntityTrait: EntityName { /// /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_exec_results(vec![ @@ -292,7 +292,7 @@ pub trait EntityTrait: EntityName { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// 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")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_exec_results(vec![ @@ -343,7 +343,7 @@ pub trait EntityTrait: EntityName { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, r#"INSERT INTO "cake" ("name") VALUES ($1), ($2) RETURNING "id""#, /// vec!["Apple Pie".into(), "Orange Scone".into()] /// )]); @@ -364,7 +364,7 @@ pub trait EntityTrait: EntityName { /// /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_exec_results(vec![ @@ -398,7 +398,7 @@ pub trait EntityTrait: EntityName { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, r#"UPDATE "fruit" SET "name" = $1 WHERE "fruit"."id" = $2 AND "fruit"."name" LIKE $3"#, /// vec!["Orange".into(), 1i32.into(), "%orange%".into()] /// )]); @@ -418,7 +418,7 @@ pub trait EntityTrait: EntityName { /// /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_exec_results(vec![ @@ -446,7 +446,7 @@ pub trait EntityTrait: EntityName { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// 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")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_exec_results(vec![ @@ -491,7 +491,7 @@ pub trait EntityTrait: EntityName { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, r#"DELETE FROM "fruit" WHERE "fruit"."id" = $1"#, vec![3i32.into()] /// )]); /// ``` @@ -510,7 +510,7 @@ pub trait EntityTrait: EntityName { /// /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{entity::*, error::*, query::*, tests_cfg::*, MockDatabase, MockExecResult, MockTransaction, DbBackend}; + /// # use sea_orm::{entity::*, error::*, query::*, tests_cfg::*, MockDatabase, MockExecResult, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_exec_results(vec![ @@ -537,7 +537,7 @@ pub trait EntityTrait: EntityName { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, r#"DELETE FROM "fruit" WHERE "fruit"."name" LIKE $1"#, vec!["%Apple%".into()] /// )]); /// ``` diff --git a/src/entity/model.rs b/src/entity/model.rs index dc890170..cd96b22e 100644 --- a/src/entity/model.rs +++ b/src/entity/model.rs @@ -38,7 +38,7 @@ pub trait FromQueryResult: Sized { /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![vec![ @@ -79,7 +79,7 @@ pub trait FromQueryResult: Sized { /// # }); /// # assert_eq!( /// # db.into_transaction_log(), - /// # vec![MockTransaction::from_sql_and_values( + /// # vec![Transaction::from_sql_and_values( /// # DbBackend::Postgres, /// # r#"SELECT "name", COUNT(*) AS "num_of_cakes" FROM "cake" GROUP BY("name")"#, /// # vec![] diff --git a/src/executor/paginator.rs b/src/executor/paginator.rs index 712c0afa..28f8574b 100644 --- a/src/executor/paginator.rs +++ b/src/executor/paginator.rs @@ -158,7 +158,7 @@ where mod tests { use crate::entity::prelude::*; use crate::{tests_cfg::*, ConnectionTrait}; - use crate::{DatabaseConnection, DbBackend, MockDatabase, MockTransaction}; + use crate::{DatabaseConnection, DbBackend, MockDatabase, Transaction}; use futures::TryStreamExt; use sea_query::{Alias, Expr, SelectStatement, Value}; @@ -228,7 +228,7 @@ mod tests { query_builder.build(select.offset(4).limit(2)), ]; - assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts)); + assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); Ok(()) } @@ -262,7 +262,7 @@ mod tests { query_builder.build(select.offset(4).limit(2)), ]; - assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts)); + assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); Ok(()) } @@ -294,7 +294,7 @@ mod tests { let query_builder = db.get_database_backend(); let stmts = vec![query_builder.build(&select)]; - assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts)); + assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); Ok(()) } @@ -345,7 +345,7 @@ mod tests { query_builder.build(select.offset(4).limit(2)), ]; - assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts)); + assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); Ok(()) } @@ -377,7 +377,7 @@ mod tests { query_builder.build(select.offset(4).limit(2)), ]; - assert_eq!(db.into_transaction_log(), MockTransaction::wrap(stmts)); + assert_eq!(db.into_transaction_log(), Transaction::wrap(stmts)); Ok(()) } } diff --git a/src/executor/query.rs b/src/executor/query.rs index ca6c1913..a164e911 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -311,7 +311,7 @@ pub trait TryGetableMany: Sized { /// ``` /// # #[cfg(all(feature = "mock", feature = "macros"))] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![vec![ @@ -358,7 +358,7 @@ pub trait TryGetableMany: Sized { /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, /// r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#, /// vec![] diff --git a/src/executor/select.rs b/src/executor/select.rs index 0bdaed6d..1c1825cc 100644 --- a/src/executor/select.rs +++ b/src/executor/select.rs @@ -132,7 +132,7 @@ where /// ``` /// # #[cfg(all(feature = "mock", feature = "macros"))] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![vec![ @@ -171,7 +171,7 @@ where /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, /// r#"SELECT "cake"."name" AS "cake_name" FROM "cake""#, /// vec![] @@ -181,7 +181,7 @@ where /// /// ``` /// # #[cfg(all(feature = "mock", feature = "macros"))] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![vec![ @@ -218,7 +218,7 @@ where /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, /// vec![ /// r#"SELECT "cake"."name" AS "cake_name", COUNT("cake"."id") AS "num_of_cakes""#, @@ -520,7 +520,7 @@ where /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![vec![ @@ -574,7 +574,7 @@ where /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, /// r#"SELECT "cake"."name", count("cake"."id") AS "num_of_cakes" FROM "cake""#, /// vec![] @@ -593,7 +593,7 @@ where /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres) /// # .append_query_results(vec![vec![ @@ -641,7 +641,7 @@ where /// assert_eq!( /// db.into_transaction_log(), /// vec![ - /// MockTransaction::from_sql_and_values( + /// Transaction::from_sql_and_values( /// DbBackend::Postgres, r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, vec![] /// ), /// ]); @@ -656,7 +656,7 @@ where /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres).into_connection(); /// # @@ -678,7 +678,7 @@ where /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake" WHERE "id" = $1"#, /// vec![1.into()] @@ -698,7 +698,7 @@ where /// ``` /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, MockTransaction, DbBackend}; + /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend}; /// # /// # let db = MockDatabase::new(DbBackend::Postgres).into_connection(); /// # @@ -720,7 +720,7 @@ where /// /// assert_eq!( /// db.into_transaction_log(), - /// vec![MockTransaction::from_sql_and_values( + /// vec![Transaction::from_sql_and_values( /// DbBackend::Postgres, /// r#"SELECT "cake"."id", "cake"."name" FROM "cake""#, /// vec![] diff --git a/src/executor/update.rs b/src/executor/update.rs index dd0449c6..9777ff79 100644 --- a/src/executor/update.rs +++ b/src/executor/update.rs @@ -211,27 +211,27 @@ mod tests { assert_eq!( db.into_transaction_log(), vec![ - MockTransaction::from_sql_and_values( + Transaction::from_sql_and_values( DbBackend::Postgres, r#"UPDATE "cake" SET "name" = $1 WHERE "cake"."id" = $2"#, vec!["Cheese Cake".into(), 1i32.into()] ), - MockTransaction::from_sql_and_values( + Transaction::from_sql_and_values( DbBackend::Postgres, r#"UPDATE "cake" SET "name" = $1 WHERE "cake"."id" = $2"#, vec!["Cheese Cake".into(), 2i32.into()] ), - MockTransaction::from_sql_and_values( + Transaction::from_sql_and_values( DbBackend::Postgres, r#"UPDATE "cake" SET "name" = $1 WHERE "cake"."id" = $2"#, vec!["Cheese Cake".into(), 2i32.into()] ), - MockTransaction::from_sql_and_values( + Transaction::from_sql_and_values( DbBackend::Postgres, r#"UPDATE "cake" SET "name" = $1 WHERE "cake"."id" = $2"#, vec!["Cheese Cake".into(), 2i32.into()] ), - MockTransaction::from_sql_and_values( + Transaction::from_sql_and_values( DbBackend::Postgres, r#"UPDATE "cake" SET "name" = $1 WHERE "cake"."id" = $2"#, vec!["Cheese Cake".into(), 2i32.into()]