update to tokio-postgres 0.6, deadpool support

Author: franklx

postgres_query/Cargo.toml

@@ -17,16 +17,17 @@ path = "examples/basic.rs"
 
 [dependencies]
 postgres_query_macro = { version = "0.3.1", path = "../postgres_query_macro" }
-proc-macro-hack = "0.5.11"
-postgres-types = "0.1.0"
-serde = "1.0.104"
-tokio-postgres = "0.5.1"
-futures = "0.3.1"
-async-trait = "0.1.22"
-thiserror = "1.0.9"
+proc-macro-hack = "0.5.19"
+postgres-types = "0.1.3"
+serde = "1.0.117"
+tokio-postgres = "0.6.0"
+deadpool-postgres = "0.6.0"
+futures = "0.3.8"
+async-trait = "0.1.41"
+thiserror = "1.0.22"
 
 [dev-dependencies]
-bytes = "0.5.3"
-tokio = { version = "0.2.6", features = ["macros"] }
-structopt = "0.3.7"
-anyhow = "1.0.26"
+bytes = "0.6.0"
+tokio = { version = "0.3.3", features = ["macros", "rt-multi-thread"] }
+structopt = "0.3.20"
+anyhow = "1.0.34"

postgres_query/src/client.rs

@@ -7,6 +7,7 @@ pub use cache::Caching;
 use async_trait::async_trait;
 use postgres_types::ToSql;
 use tokio_postgres::{error::Error as SqlError, Client, RowStream, Statement, Transaction};
+use deadpool_postgres::{Client as DPClient};
 
 /// A generic client with basic functionality.
 #[async_trait]
@@ -80,6 +81,29 @@ impl GenericClient for Client {
     }
 }
 
+#[async_trait]
+impl GenericClient for DPClient {
+    async fn prepare(&self, sql: &str) -> Result<Statement, SqlError> {
+        DPClient::prepare(self, sql).await
+    }
+
+    async fn execute_raw<'a>(
+        &'a self,
+        statement: &Statement,
+        parameters: &[&'a (dyn ToSql + Sync)],
+    ) -> Result<u64, SqlError> {
+        DPClient::execute_raw(self, statement, parameters).await
+    }
+
+    async fn query_raw<'a>(
+        &'a self,
+        statement: &Statement,
+        parameters: &[&'a (dyn ToSql + Sync)],
+    ) -> Result<RowStream, SqlError> {
+        DPClient::query_raw(self, statement, parameters).await
+    }
+}
+
 #[async_trait]
 impl GenericClient for Transaction<'_> {
     async fn prepare(&self, sql: &str) -> Result<Statement, SqlError> {

postgres_query_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres_query_macro"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Christofer Nolander <christofer.nolander@gmail.com>"]
 edition = "2018"
 description = "Write and execute SQL queries with ease"
@@ -12,7 +12,7 @@ readme = "../README.md"
 proc-macro = true
 
 [dependencies]
-proc-macro-hack = "0.5.11"
-quote = "1.0.2"
-syn = { version = "1.0.11", features = ["full"] }
-proc-macro2 = "1.0.6"
+proc-macro-hack = "0.5.19"
+quote = "1.0.7"
+syn = { version = "1.0.48", features = ["full"] }
+proc-macro2 = "1.0.24"