Rename Query to ToStatement

Author: sfackler

postgres/src/client.rs

@@ -10,7 +10,7 @@ use tokio_postgres::{MakeTlsMode, Socket, TlsMode};
 
 #[cfg(feature = "runtime")]
 use crate::Builder;
-use crate::{Query, Statement, Transaction};
+use crate::{Statement, ToStatement, Transaction};
 
 pub struct Client(tokio_postgres::Client);
 
@@ -42,15 +42,15 @@ impl Client {
 
     pub fn execute<T>(&mut self, query: &T, params: &[&dyn ToSql]) -> Result<u64, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
     {
         let statement = query.__statement(self)?;
         self.0.execute(&statement.0, params).wait()
     }
 
     pub fn query<T>(&mut self, query: &T, params: &[&dyn ToSql]) -> Result<Vec<Row>, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
     {
         let statement = query.__statement(self)?;
         self.0.query(&statement.0, params).collect().wait()
@@ -63,7 +63,7 @@ impl Client {
         reader: R,
     ) -> Result<u64, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
         R: Read,
     {
         let statement = query.__statement(self)?;
@@ -78,7 +78,7 @@ impl Client {
         params: &[&dyn ToSql],
     ) -> Result<CopyOutReader<'_>, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
     {
         let statement = query.__statement(self)?;
         let mut stream = self.0.copy_out(&statement.0, params).wait();

postgres/src/lib.rs

@@ -7,8 +7,8 @@ use tokio::runtime::{self, Runtime};
 mod builder;
 mod client;
 mod portal;
-mod query;
 mod statement;
+mod to_statement;
 mod transaction;
 
 #[cfg(feature = "runtime")]
@@ -19,8 +19,8 @@ mod test;
 pub use crate::builder::*;
 pub use crate::client::*;
 pub use crate::portal::*;
-pub use crate::query::*;
 pub use crate::statement::*;
+pub use crate::to_statement::*;
 pub use crate::transaction::*;
 
 #[cfg(feature = "runtime")]

postgres/src/query.rs postgres/src/to_statement.rspostgres/src/query.rs renamed to postgres/src/to_statement.rs

@@ -6,22 +6,22 @@ mod sealed {
     pub trait Sealed {}
 }
 
-pub trait Query: sealed::Sealed {
+pub trait ToStatement: sealed::Sealed {
     #[doc(hidden)]
     fn __statement(&self, client: &mut Client) -> Result<Statement, Error>;
 }
 
 impl sealed::Sealed for str {}
 
-impl Query for str {
+impl ToStatement for str {
     fn __statement(&self, client: &mut Client) -> Result<Statement, Error> {
         client.prepare(self)
     }
 }
 
 impl sealed::Sealed for Statement {}
 
-impl Query for Statement {
+impl ToStatement for Statement {
     fn __statement(&self, _: &mut Client) -> Result<Statement, Error> {
         Ok(self.clone())
     }

postgres/src/transaction.rs

@@ -3,7 +3,7 @@ use std::io::Read;
 use tokio_postgres::types::{ToSql, Type};
 use tokio_postgres::{Error, Row};
 
-use crate::{Client, CopyOutReader, Portal, Query, Statement};
+use crate::{Client, CopyOutReader, Portal, Statement, ToStatement};
 
 pub struct Transaction<'a> {
     client: &'a mut Client,
@@ -62,21 +62,21 @@ impl<'a> Transaction<'a> {
 
     pub fn execute<T>(&mut self, query: &T, params: &[&dyn ToSql]) -> Result<u64, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
     {
         self.client.execute(query, params)
     }
 
     pub fn query<T>(&mut self, query: &T, params: &[&dyn ToSql]) -> Result<Vec<Row>, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
     {
         self.client.query(query, params)
     }
 
     pub fn bind<T>(&mut self, query: &T, params: &[&dyn ToSql]) -> Result<Portal, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
     {
         let statement = query.__statement(&mut self.client)?;
         self.client
@@ -101,7 +101,7 @@ impl<'a> Transaction<'a> {
         reader: R,
     ) -> Result<u64, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
         R: Read,
     {
         self.client.copy_in(query, params, reader)
@@ -113,7 +113,7 @@ impl<'a> Transaction<'a> {
         params: &[&dyn ToSql],
     ) -> Result<CopyOutReader<'_>, Error>
     where
-        T: ?Sized + Query,
+        T: ?Sized + ToStatement,
     {
         self.client.copy_out(query, params)
     }