Merge pull request #82 from weiznich/fix/81

Fix #81 by adding the missing impl

Author: weiznich

src/pooled_connection/mod.rs

@@ -5,8 +5,10 @@
 //! * [deadpool](self::deadpool)
 //! * [bb8](self::bb8)
 //! * [mobc](self::mobc)
-use crate::TransactionManager;
 use crate::{AsyncConnection, SimpleAsyncConnection};
+use crate::{TransactionManager, UpdateAndFetchResults};
+use diesel::associations::HasTable;
+use diesel::QueryResult;
 use futures_util::{future, FutureExt};
 use std::fmt;
 use std::ops::DerefMut;
@@ -188,6 +190,21 @@ where
     }
 }
 
+#[async_trait::async_trait]
+impl<'b, Changes, Output, Conn> UpdateAndFetchResults<Changes, Output> for Conn
+where
+    Conn: DerefMut + Send,
+    Changes: diesel::prelude::Identifiable + HasTable + Send,
+    Conn::Target: UpdateAndFetchResults<Changes, Output>,
+{
+    async fn update_and_fetch(&mut self, changeset: Changes) -> QueryResult<Output>
+    where
+        Changes: 'async_trait,
+    {
+        self.deref_mut().update_and_fetch(changeset).await
+    }
+}
+
 #[derive(diesel::query_builder::QueryId)]
 struct CheckConnectionQuery;
 

tests/lib.rs

@@ -7,6 +7,8 @@ use std::pin::Pin;
 
 #[cfg(feature = "postgres")]
 mod custom_types;
+#[cfg(any(feature = "bb8", feature = "deadpool", feature = "mobc"))]
+mod pooling;
 mod type_check;
 
 async fn transaction_test(conn: &mut TestConnection) -> QueryResult<()> {
@@ -70,7 +72,14 @@ diesel::table! {
     }
 }
 
-#[derive(diesel::Queryable, diesel::Selectable, Debug, PartialEq)]
+#[derive(
+    diesel::Queryable,
+    diesel::Selectable,
+    Debug,
+    PartialEq,
+    diesel::AsChangeset,
+    diesel::Identifiable,
+)]
 struct User {
     id: i32,
     name: String,
@@ -101,7 +110,7 @@ async fn test_basic_insert_and_load() -> QueryResult<()> {
 #[cfg(feature = "mysql")]
 async fn setup(connection: &mut TestConnection) {
     diesel::sql_query(
-        "CREATE TABLE IF NOT EXISTS users (
+        "CREATE TEMPORARY TABLE users (
                 id INTEGER PRIMARY KEY AUTO_INCREMENT,
                 name TEXT NOT NULL
             ) CHARACTER SET utf8mb4",
@@ -153,7 +162,7 @@ async fn postgres_cancel_token() {
 #[cfg(feature = "postgres")]
 async fn setup(connection: &mut TestConnection) {
     diesel::sql_query(
-        "CREATE TABLE IF NOT EXISTS users (
+        "CREATE TEMPORARY TABLE users (
                 id SERIAL PRIMARY KEY,
                 name VARCHAR NOT NULL
             )",

tests/pooling.rs

@@ -0,0 +1,93 @@
+use super::{users, User};
+use diesel::prelude::*;
+use diesel_async::{RunQueryDsl, SaveChangesDsl};
+
+#[tokio::test]
+#[cfg(feature = "bb8")]
+async fn save_changes_bb8() {
+    use diesel_async::pooled_connection::bb8::Pool;
+    use diesel_async::pooled_connection::AsyncDieselConnectionManager;
+
+    let db_url = std::env::var("DATABASE_URL").unwrap();
+
+    let config = AsyncDieselConnectionManager::<super::TestConnection>::new(db_url);
+    let pool = Pool::builder().max_size(1).build(config).await.unwrap();
+
+    let mut conn = pool.get().await.unwrap();
+
+    super::setup(&mut *conn).await;
+
+    diesel::insert_into(users::table)
+        .values(users::name.eq("John"))
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    let mut u = users::table.first::<User>(&mut conn).await.unwrap();
+    assert_eq!(u.name, "John");
+
+    u.name = "Jane".into();
+    let u2: User = u.save_changes(&mut conn).await.unwrap();
+
+    assert_eq!(u2.name, "Jane");
+}
+
+#[tokio::test]
+#[cfg(feature = "deadpool")]
+async fn save_changes_deadpool() {
+    use diesel_async::pooled_connection::deadpool::Pool;
+    use diesel_async::pooled_connection::AsyncDieselConnectionManager;
+
+    let db_url = std::env::var("DATABASE_URL").unwrap();
+
+    let config = AsyncDieselConnectionManager::<super::TestConnection>::new(db_url);
+    let pool = Pool::builder(config).max_size(1).build().unwrap();
+
+    let mut conn = pool.get().await.unwrap();
+
+    super::setup(&mut *conn).await;
+
+    diesel::insert_into(users::table)
+        .values(users::name.eq("John"))
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    let mut u = users::table.first::<User>(&mut conn).await.unwrap();
+    assert_eq!(u.name, "John");
+
+    u.name = "Jane".into();
+    let u2: User = u.save_changes(&mut conn).await.unwrap();
+
+    assert_eq!(u2.name, "Jane");
+}
+
+#[tokio::test]
+#[cfg(feature = "mobc")]
+async fn save_changes_mobc() {
+    use diesel_async::pooled_connection::mobc::Pool;
+    use diesel_async::pooled_connection::AsyncDieselConnectionManager;
+
+    let db_url = std::env::var("DATABASE_URL").unwrap();
+
+    let config = AsyncDieselConnectionManager::<super::TestConnection>::new(db_url);
+    let pool = Pool::new(config);
+
+    let mut conn = pool.get().await.unwrap();
+
+    super::setup(&mut *conn).await;
+
+    diesel::insert_into(users::table)
+        .values(users::name.eq("John"))
+        .execute(&mut conn)
+        .await
+        .unwrap();
+
+    let mut u = users::table.first::<User>(&mut conn).await.unwrap();
+    assert_eq!(u.name, "John");
+
+    u.name = "Jane".into();
+    let u2: User = u.save_changes(&mut conn).await.unwrap();
+
+    assert_eq!(u2.name, "Jane");
+}