diff --git a/postgres/src/client.rs b/postgres/src/client.rs index c9ff4807..e3499792 100644 --- a/postgres/src/client.rs +++ b/postgres/src/client.rs @@ -1,5 +1,5 @@ use crate::{ - CancelToken, Config, CopyInWriter, CopyOutReader, GenericConnection, RowIter, Statement, + CancelToken, Config, CopyInWriter, CopyOutReader, GenericClient, RowIter, Statement, ToStatement, Transaction, }; use std::ops::{Deref, DerefMut}; @@ -494,22 +494,25 @@ impl Client { } } -impl GenericConnection for Client { +impl GenericClient for Client { fn execute(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result where T: ?Sized + ToStatement, { self.execute(query, params) } + fn query(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result, Error> where T: ?Sized + ToStatement, { self.query(query, params) } + fn prepare(&mut self, query: &str) -> Result { self.prepare(query) } + fn transaction(&mut self) -> Result, Error> { self.transaction() } diff --git a/postgres/src/generic_connection.rs b/postgres/src/generic_client.rs similarity index 96% rename from postgres/src/generic_connection.rs rename to postgres/src/generic_client.rs index 3a8e6788..354c6bb0 100644 --- a/postgres/src/generic_connection.rs +++ b/postgres/src/generic_client.rs @@ -3,7 +3,7 @@ use tokio_postgres::types::ToSql; use tokio_postgres::{Error, Row}; /// A trait allowing abstraction over connections and transactions -pub trait GenericConnection { +pub trait GenericClient { /// Like `Client::execute`. fn execute(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result where diff --git a/postgres/src/lib.rs b/postgres/src/lib.rs index 2a9da962..1bc8a883 100644 --- a/postgres/src/lib.rs +++ b/postgres/src/lib.rs @@ -61,7 +61,7 @@ pub use crate::copy_in_writer::CopyInWriter; pub use crate::copy_out_reader::CopyOutReader; #[doc(no_inline)] pub use crate::error::Error; -pub use crate::generic_connection::GenericConnection; +pub use crate::generic_client::GenericClient; #[doc(no_inline)] pub use crate::row::{Row, SimpleQueryRow}; pub use crate::row_iter::RowIter; @@ -75,7 +75,7 @@ mod client; pub mod config; mod copy_in_writer; mod copy_out_reader; -mod generic_connection; +mod generic_client; mod lazy_pin; mod row_iter; mod transaction; diff --git a/postgres/src/transaction.rs b/postgres/src/transaction.rs index 2ed0ae33..c1fdcf06 100644 --- a/postgres/src/transaction.rs +++ b/postgres/src/transaction.rs @@ -1,5 +1,5 @@ use crate::{ - CancelToken, CopyInWriter, CopyOutReader, GenericConnection, Portal, RowIter, Rt, Statement, + CancelToken, CopyInWriter, CopyOutReader, GenericClient, Portal, RowIter, Rt, Statement, ToStatement, }; use tokio::runtime::Runtime; @@ -186,22 +186,25 @@ impl<'a> Transaction<'a> { } } -impl<'a> GenericConnection for Transaction<'a> { +impl<'a> GenericClient for Transaction<'a> { fn execute(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result where T: ?Sized + ToStatement, { self.execute(query, params) } + fn query(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result, Error> where T: ?Sized + ToStatement, { self.query(query, params) } + fn prepare(&mut self, query: &str) -> Result { self.prepare(query) } + fn transaction(&mut self) -> Result, Error> { self.transaction() }