diff --git a/src/database/db_connection.rs b/src/database/db_connection.rs index 569f3896..7f43ae84 100644 --- a/src/database/db_connection.rs +++ b/src/database/db_connection.rs @@ -1,5 +1,5 @@ -use std::{future::Future, pin::Pin, sync::Arc}; -use crate::{DatabaseTransaction, DbBackend, DbErr, ExecResult, MockDatabaseConnection, QueryResult, Statement, TransactionError}; +use std::{future::Future, pin::Pin}; +use crate::{DatabaseTransaction, DbBackend, DbErr, ExecResult, QueryResult, Statement, TransactionError}; use futures::Stream; #[cfg(feature = "sqlx-dep")] use sqlx::pool::PoolConnection; @@ -12,7 +12,7 @@ pub(crate) enum InnerConnection { #[cfg(feature = "sqlx-sqlite")] Sqlite(PoolConnection), #[cfg(feature = "mock")] - Mock(Arc), + Mock(std::sync::Arc), } #[async_trait::async_trait] diff --git a/src/executor/insert.rs b/src/executor/insert.rs index 7683f9bb..10b5d8d3 100644 --- a/src/executor/insert.rs +++ b/src/executor/insert.rs @@ -1,4 +1,4 @@ -use crate::{ActiveModelTrait, ConnectionTrait, EntityTrait, Insert, PrimaryKeyTrait, Statement, TryFromU64, error::*}; +use crate::{ActiveModelTrait, ConnectionTrait, DbBackend, EntityTrait, Insert, PrimaryKeyTrait, Statement, TryFromU64, error::*}; use sea_query::InsertStatement; use std::marker::PhantomData; diff --git a/src/executor/paginator.rs b/src/executor/paginator.rs index a4e9bc69..0d07591f 100644 --- a/src/executor/paginator.rs +++ b/src/executor/paginator.rs @@ -1,4 +1,4 @@ -use crate::{ConnectionTrait, SelectorTrait, error::*}; +use crate::{ConnectionTrait, DbBackend, SelectorTrait, error::*}; use async_stream::stream; use futures::Stream; use sea_query::{Alias, Expr, SelectStatement}; diff --git a/src/executor/select.rs b/src/executor/select.rs index cff4a348..dc8b7afb 100644 --- a/src/executor/select.rs +++ b/src/executor/select.rs @@ -1,6 +1,6 @@ #[cfg(feature = "sqlx-dep")] use std::pin::Pin; -use crate::{ConnectionTrait, EntityTrait, FromQueryResult, IdenStatic, Iterable, JsonValue, ModelTrait, Paginator, PrimaryKeyToColumn, QueryResult, Select, SelectA, SelectB, SelectTwo, SelectTwoMany, Statement, error::*}; +use crate::{ConnectionTrait, EntityTrait, FromQueryResult, IdenStatic, Iterable, JsonValue, ModelTrait, Paginator, PrimaryKeyToColumn, QueryResult, Select, SelectA, SelectB, SelectTwo, SelectTwoMany, Statement, TryGetableMany, error::*}; #[cfg(feature = "sqlx-dep")] use futures::{Stream, TryStreamExt}; use sea_query::SelectStatement;