dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename to GenericClient

Browse Source
This commit is contained in:
Steven Fackler 2020-01-02 20:44:07 -05:00
parent 6deef22769
commit a865207ff6
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
postgres/src/client.rs
View File

@ -1,5 +1,5 @@
use crate::{ use crate::{
CancelToken, Config, CopyInWriter, CopyOutReader, GenericConnection, RowIter, Statement, CancelToken, Config, CopyInWriter, CopyOutReader, GenericClient, RowIter, Statement,
ToStatement, Transaction, ToStatement, Transaction,
}; };
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
@ -494,22 +494,25 @@ impl Client {
} }
} }
impl GenericConnection for Client { impl GenericClient for Client {
fn execute<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error> fn execute<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error>
where where
T: ?Sized + ToStatement, T: ?Sized + ToStatement,
{ {
self.execute(query, params) self.execute(query, params)
} }
fn query<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<Vec<Row>, Error> fn query<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<Vec<Row>, Error>
where where
T: ?Sized + ToStatement, T: ?Sized + ToStatement,
{ {
self.query(query, params) self.query(query, params)
} }
fn prepare(&mut self, query: &str) -> Result<Statement, Error> { fn prepare(&mut self, query: &str) -> Result<Statement, Error> {
self.prepare(query) self.prepare(query)
} }
fn transaction(&mut self) -> Result<Transaction<'_>, Error> { fn transaction(&mut self) -> Result<Transaction<'_>, Error> {
self.transaction() self.transaction()
} }

2
postgres/src/generic_connection.rs → postgres/src/generic_client.rs
View File

@ -3,7 +3,7 @@ use tokio_postgres::types::ToSql;
use tokio_postgres::{Error, Row}; use tokio_postgres::{Error, Row};
/// A trait allowing abstraction over connections and transactions /// A trait allowing abstraction over connections and transactions
pub trait GenericConnection { pub trait GenericClient {
/// Like `Client::execute`. /// Like `Client::execute`.
fn execute<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error> fn execute<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error>
where where

4
postgres/src/lib.rs
View File

@ -61,7 +61,7 @@ pub use crate::copy_in_writer::CopyInWriter;
pub use crate::copy_out_reader::CopyOutReader; pub use crate::copy_out_reader::CopyOutReader;
#[doc(no_inline)] #[doc(no_inline)]
pub use crate::error::Error; pub use crate::error::Error;
pub use crate::generic_connection::GenericConnection; pub use crate::generic_client::GenericClient;
#[doc(no_inline)] #[doc(no_inline)]
pub use crate::row::{Row, SimpleQueryRow}; pub use crate::row::{Row, SimpleQueryRow};
pub use crate::row_iter::RowIter; pub use crate::row_iter::RowIter;
@ -75,7 +75,7 @@ mod client;
pub mod config; pub mod config;
mod copy_in_writer; mod copy_in_writer;
mod copy_out_reader; mod copy_out_reader;
mod generic_connection; mod generic_client;
mod lazy_pin; mod lazy_pin;
mod row_iter; mod row_iter;
mod transaction; mod transaction;

7
postgres/src/transaction.rs
View File

@ -1,5 +1,5 @@
use crate::{ use crate::{
CancelToken, CopyInWriter, CopyOutReader, GenericConnection, Portal, RowIter, Rt, Statement, CancelToken, CopyInWriter, CopyOutReader, GenericClient, Portal, RowIter, Rt, Statement,
ToStatement, ToStatement,
}; };
use tokio::runtime::Runtime; 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<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error> fn execute<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<u64, Error>
where where
T: ?Sized + ToStatement, T: ?Sized + ToStatement,
{ {
self.execute(query, params) self.execute(query, params)
} }
fn query<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<Vec<Row>, Error> fn query<T>(&mut self, query: &T, params: &[&(dyn ToSql + Sync)]) -> Result<Vec<Row>, Error>
where where
T: ?Sized + ToStatement, T: ?Sized + ToStatement,
{ {
self.query(query, params) self.query(query, params)
} }
fn prepare(&mut self, query: &str) -> Result<Statement, Error> { fn prepare(&mut self, query: &str) -> Result<Statement, Error> {
self.prepare(query) self.prepare(query)
} }
fn transaction(&mut self) -> Result<Transaction<'_>, Error> { fn transaction(&mut self) -> Result<Transaction<'_>, Error> {
self.transaction() self.transaction()
} }