Merge pull request #109 from DevLazio/main

Add a From<AsyncConnection> for AsyncConnectionWrapper

Author: weiznich

.github/workflows/ci.yml

@@ -117,7 +117,9 @@ jobs:
         run: cargo +${{ matrix.rust }} test --manifest-path Cargo.toml --no-default-features --features "${{ matrix.backend }} deadpool bb8 mobc"
       - name: Run examples
         if: matrix.backend == 'postgres'
-        run: cargo +${{ matrix.rust }} check --manifest-path examples/postgres/pooled-with-rustls/Cargo.toml
+        run: |
+          cargo +${{ matrix.rust }} check --manifest-path examples/postgres/pooled-with-rustls/Cargo.toml
+          cargo +${{ matrix.rust }} check --manifest-path examples/postgres/run-pending-migrations-with-rustls/Cargo.toml
 
   rustfmt_and_clippy:
     name: Check rustfmt style && run clippy

Cargo.toml

@@ -55,6 +55,7 @@ rustdoc-args = ["--cfg", "doc_cfg"]
 [workspace]
 members = [
         ".",
-        "examples/postgres/pooled-with-rustls"
+        "examples/postgres/pooled-with-rustls",
+        "examples/postgres/run-pending-migrations-with-rustls",
 ]
 

examples/postgres/run-pending-migrations-with-rustls/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "run-pending-migrations-with-rustls"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+diesel = { version = "2.1.0", default-features = false, features = ["postgres"] }
+diesel-async = { version = "0.4.0", path = "../../../", features = ["bb8", "postgres", "async-connection-wrapper"] }
+diesel_migrations = "2.1.0"
+futures-util = "0.3.21"
+rustls = "0.20.8"
+rustls-native-certs = "0.6.2"
+tokio = { version = "1.2.0", default-features = false, features = ["macros", "rt-multi-thread"] }
+tokio-postgres = "0.7.7"
+tokio-postgres-rustls = "0.9.0"

examples/postgres/run-pending-migrations-with-rustls/migrations/2023-09-08-075742_dummy_migration/down.sql

@@ -0,0 +1 @@
+SELECT 0;

examples/postgres/run-pending-migrations-with-rustls/migrations/2023-09-08-075742_dummy_migration/up.sql

@@ -0,0 +1 @@
+SELECT 1;

examples/postgres/run-pending-migrations-with-rustls/src/main.rs

@@ -0,0 +1,55 @@
+use diesel::{ConnectionError, ConnectionResult};
+use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
+use diesel_async::AsyncPgConnection;
+use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
+use futures_util::future::BoxFuture;
+use futures_util::FutureExt;
+
+pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // Should be in the form of postgres://user:password@localhost/database?sslmode=require
+    let db_url = std::env::var("DATABASE_URL").expect("Env var `DATABASE_URL` not set");
+
+    let async_connection = establish_connection(db_url.as_str()).await?;
+
+    let mut async_wrapper: AsyncConnectionWrapper<AsyncPgConnection> =
+        AsyncConnectionWrapper::from(async_connection);
+
+    tokio::task::spawn_blocking(move || {
+        async_wrapper.run_pending_migrations(MIGRATIONS).unwrap();
+    })
+    .await?;
+
+    Ok(())
+}
+
+fn establish_connection(config: &str) -> BoxFuture<ConnectionResult<AsyncPgConnection>> {
+    let fut = async {
+        // We first set up the way we want rustls to work.
+        let rustls_config = rustls::ClientConfig::builder()
+            .with_safe_defaults()
+            .with_root_certificates(root_certs())
+            .with_no_client_auth();
+        let tls = tokio_postgres_rustls::MakeRustlsConnect::new(rustls_config);
+        let (client, conn) = tokio_postgres::connect(config, tls)
+            .await
+            .map_err(|e| ConnectionError::BadConnection(e.to_string()))?;
+        tokio::spawn(async move {
+            if let Err(e) = conn.await {
+                eprintln!("Database connection: {e}");
+            }
+        });
+        AsyncPgConnection::try_from(client).await
+    };
+    fut.boxed()
+}
+
+fn root_certs() -> rustls::RootCertStore {
+    let mut roots = rustls::RootCertStore::empty();
+    let certs = rustls_native_certs::load_native_certs().expect("Certs not loadable!");
+    let certs: Vec<_> = certs.into_iter().map(|cert| cert.0).collect();
+    roots.add_parsable_certificates(&certs);
+    roots
+}

src/async_connection_wrapper.rs

@@ -109,6 +109,19 @@ mod implementation {
         runtime: B,
     }
 
+    impl<C, B> From<C> for AsyncConnectionWrapper<C, B>
+    where
+        C: crate::AsyncConnection,
+        B: BlockOn + Send,
+    {
+        fn from(inner: C) -> Self {
+            Self {
+                inner,
+                runtime: B::get_runtime(),
+            }
+        }
+    }
+
     impl<C, B> diesel::connection::SimpleConnection for AsyncConnectionWrapper<C, B>
     where
         C: crate::SimpleAsyncConnection,