Make the SyncConnectionWrapper poolable

Author: weiznich

src/lib.rs

@@ -93,6 +93,7 @@ pub mod pg;
 ))]
 pub mod pooled_connection;
 mod run_query_dsl;
+#[cfg(any(feature = "postgres", feature = "mysql"))]
 mod stmt_cache;
 #[cfg(feature = "sync-connection-wrapper")]
 pub mod sync_connection_wrapper;

src/pooled_connection/bb8.rs

@@ -27,6 +27,13 @@
 //! #     config
 //! #  }
 //! #
+//! # #[cfg(feature = "sqlite")]
+//! # fn get_config() -> AsyncDieselConnectionManager<diesel_async::sync_connection_wrapper::SyncConnectionWrapper<diesel::SqliteConnection>> {
+//! #     let db_url = database_url_from_env("SQLITE_DATABASE_URL");
+//! #     let config = AsyncDieselConnectionManager::<diesel_async::sync_connection_wrapper::SyncConnectionWrapper<diesel::SqliteConnection>>::new(db_url);
+//! #     config
+//! # }
+//! #
 //! # async fn run_test() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! #     use schema::users::dsl::*;
 //! #     let config = get_config();

src/pooled_connection/deadpool.rs

@@ -27,6 +27,13 @@
 //! #     config
 //! #  }
 //! #
+//! # #[cfg(feature = "sqlite")]
+//! # fn get_config() -> AsyncDieselConnectionManager<diesel_async::sync_connection_wrapper::SyncConnectionWrapper<diesel::SqliteConnection>> {
+//! #     let db_url = database_url_from_env("SQLITE_DATABASE_URL");
+//! #     let config = AsyncDieselConnectionManager::<diesel_async::sync_connection_wrapper::SyncConnectionWrapper<diesel::SqliteConnection>>::new(db_url);
+//! #     config
+//! # }
+//! #
 //! # async fn run_test() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! #     use schema::users::dsl::*;
 //! #     let config = get_config();

src/pooled_connection/mobc.rs

@@ -27,6 +27,13 @@
 //! #     config
 //! #  }
 //! #
+//! # #[cfg(feature = "sqlite")]
+//! # fn get_config() -> AsyncDieselConnectionManager<diesel_async::sync_connection_wrapper::SyncConnectionWrapper<diesel::SqliteConnection>> {
+//! #     let db_url = database_url_from_env("SQLITE_DATABASE_URL");
+//! #     let config = AsyncDieselConnectionManager::<diesel_async::sync_connection_wrapper::SyncConnectionWrapper<diesel::SqliteConnection>>::new(db_url);
+//! #     config
+//! # }
+//! #
 //! # async fn run_test() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! #     use schema::users::dsl::*;
 //! #     let config = get_config();

src/sync_connection_wrapper.rs

@@ -284,3 +284,18 @@ impl<C> SyncConnectionWrapper<C> {
         }
     }
 }
+
+#[cfg(any(
+    feature = "deadpool",
+    feature = "bb8",
+    feature = "mobc",
+    feature = "r2d2"
+))]
+impl<C> crate::pooled_connection::PoolableConnection for SyncConnectionWrapper<C>
+where
+    Self: AsyncConnection,
+{
+    fn is_broken(&mut self) -> bool {
+        Self::TransactionManager::is_broken_transaction_manager(self)
+    }
+}

tests/pooling.rs

@@ -1,6 +1,8 @@
 use super::{users, User};
 use diesel::prelude::*;
-use diesel_async::{RunQueryDsl, SaveChangesDsl};
+use diesel_async::RunQueryDsl;
+#[cfg(not(feature = "sqlite"))]
+use diesel_async::SaveChangesDsl;
 
 #[tokio::test]
 #[cfg(feature = "bb8")]
@@ -23,13 +25,17 @@ async fn save_changes_bb8() {
         .await
         .unwrap();
 
-    let mut u = users::table.first::<User>(&mut conn).await.unwrap();
+    let 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();
+    #[cfg(not(feature = "sqlite"))]
+    {
+        let mut u = u;
+        u.name = "Jane".into();
+        let u2: User = u.save_changes(&mut conn).await.unwrap();
 
-    assert_eq!(u2.name, "Jane");
+        assert_eq!(u2.name, "Jane");
+    }
 }
 
 #[tokio::test]
@@ -53,13 +59,17 @@ async fn save_changes_deadpool() {
         .await
         .unwrap();
 
-    let mut u = users::table.first::<User>(&mut conn).await.unwrap();
+    let 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();
+    #[cfg(not(feature = "sqlite"))]
+    {
+        let mut u = u;
+        u.name = "Jane".into();
+        let u2: User = u.save_changes(&mut conn).await.unwrap();
 
-    assert_eq!(u2.name, "Jane");
+        assert_eq!(u2.name, "Jane");
+    }
 }
 
 #[tokio::test]
@@ -83,11 +93,15 @@ async fn save_changes_mobc() {
         .await
         .unwrap();
 
-    let mut u = users::table.first::<User>(&mut conn).await.unwrap();
+    let 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();
+    #[cfg(not(feature = "sqlite"))]
+    {
+        let mut u = u;
+        u.name = "Jane".into();
+        let u2: User = u.save_changes(&mut conn).await.unwrap();
 
-    assert_eq!(u2.name, "Jane");
+        assert_eq!(u2.name, "Jane");
+    }
 }