mirror of
https://github.com/launchbadge/sqlx.git
synced 2025-12-29 21:00:54 +00:00
f462343787
* Allow `conn.fetch(" ... ")` to be called where `conn` is an owned Connection
* Executor::fetch -> RefExecutor::fetch_by_ref
* Executor::fetch_by_ref -> Executor::fetch
* Move `Connection::describe` to `Executor::describe`
* `Transaction` is no longer a `Connection`
* `Connection` has `Executor` as a super-trait again which greatly simplifies bounds
115 lines
2.8 KiB
Rust
115 lines
2.8 KiB
Rust
use std::ops::DerefMut;
|
|
|
|
use futures_core::{future::BoxFuture, stream::BoxStream};
|
|
use futures_util::StreamExt;
|
|
|
|
use crate::{
|
|
connection::{Connect, Connection},
|
|
describe::Describe,
|
|
executor::{Executor, RefExecutor},
|
|
pool::Pool,
|
|
Cursor, Database,
|
|
};
|
|
|
|
use super::PoolConnection;
|
|
use crate::database::HasCursor;
|
|
use crate::executor::Execute;
|
|
|
|
impl<'p, C, DB> Executor for &'p Pool<C>
|
|
where
|
|
C: Connect<Database = DB>,
|
|
DB: Database<Connection = C>,
|
|
DB: for<'c, 'q> HasCursor<'c, 'q, Database = DB>,
|
|
{
|
|
type Database = DB;
|
|
|
|
fn execute<'e, 'q, E: 'e>(&'e mut self, query: E) -> BoxFuture<'e, crate::Result<u64>>
|
|
where
|
|
E: Execute<'q, Self::Database>,
|
|
{
|
|
Box::pin(async move { self.acquire().await?.execute(query).await })
|
|
}
|
|
|
|
fn fetch<'e, 'q, E>(&'e mut self, query: E) -> <Self::Database as HasCursor<'_, 'q>>::Cursor
|
|
where
|
|
E: Execute<'q, DB>,
|
|
{
|
|
DB::Cursor::from_pool(self, query)
|
|
}
|
|
|
|
fn describe<'e, 'q, E: 'e>(
|
|
&'e mut self,
|
|
query: E,
|
|
) -> BoxFuture<'e, crate::Result<Describe<Self::Database>>>
|
|
where
|
|
E: Execute<'q, Self::Database>,
|
|
{
|
|
Box::pin(async move { self.acquire().await?.describe(query).await })
|
|
}
|
|
}
|
|
|
|
impl<'p, C, DB> RefExecutor<'p> for &'p Pool<C>
|
|
where
|
|
C: Connect<Database = DB>,
|
|
DB: Database<Connection = C>,
|
|
DB: for<'c, 'q> HasCursor<'c, 'q>,
|
|
for<'c> &'c mut C: RefExecutor<'c>,
|
|
{
|
|
type Database = DB;
|
|
|
|
fn fetch_by_ref<'q, E>(self, query: E) -> <Self::Database as HasCursor<'p, 'q>>::Cursor
|
|
where
|
|
E: Execute<'q, DB>,
|
|
{
|
|
DB::Cursor::from_pool(self, query)
|
|
}
|
|
}
|
|
|
|
impl<C> Executor for PoolConnection<C>
|
|
where
|
|
C: Connect,
|
|
{
|
|
type Database = C::Database;
|
|
|
|
fn execute<'e, 'q, E: 'e>(&'e mut self, query: E) -> BoxFuture<'e, crate::Result<u64>>
|
|
where
|
|
E: Execute<'q, Self::Database>,
|
|
{
|
|
(**self).execute(query)
|
|
}
|
|
|
|
fn fetch<'e, 'q, E>(&'e mut self, query: E) -> <C::Database as HasCursor<'_, 'q>>::Cursor
|
|
where
|
|
E: Execute<'q, Self::Database>,
|
|
{
|
|
(**self).fetch(query)
|
|
}
|
|
|
|
fn describe<'e, 'q, E: 'e>(
|
|
&'e mut self,
|
|
query: E,
|
|
) -> BoxFuture<'e, crate::Result<Describe<Self::Database>>>
|
|
where
|
|
E: Execute<'q, Self::Database>,
|
|
{
|
|
(**self).describe(query)
|
|
}
|
|
}
|
|
|
|
impl<'c, C, DB> RefExecutor<'c> for &'c mut PoolConnection<C>
|
|
where
|
|
C: Connect<Database = DB>,
|
|
DB: Database<Connection = C>,
|
|
DB: for<'c2, 'q> HasCursor<'c2, 'q, Database = DB>,
|
|
&'c mut C: RefExecutor<'c, Database = DB>,
|
|
{
|
|
type Database = DB;
|
|
|
|
fn fetch_by_ref<'q, E>(self, query: E) -> <Self::Database as HasCursor<'c, 'q>>::Cursor
|
|
where
|
|
E: Execute<'q, Self::Database>,
|
|
{
|
|
(**self).fetch(query)
|
|
}
|
|
}
|