added ability to create connection pool for single-use database with …

…unrestricted privileges; bumped to v0.2.0
yasamoka · Apr 13, 2024 · 2ca9cfd · 2ca9cfd
1 parent e0a3f71
commit 2ca9cfd
Show file tree

Hide file tree

Showing 53 changed files with 1,790 additions and 451 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "db-pool"
-version = "0.1.4"
+version = "0.2.0"
 edition = "2021"
 description = "A thread-safe database pool for running database-tied integration tests in parallel"
 license = "MIT"

diff --git a/book/Cargo.lock b/book/Cargo.lock
diff --git a/book/Cargo.toml b/book/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "book"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/book/src/tutorials/async/05.rs b/book/src/tutorials/async/05.rs
@@ -7,14 +7,12 @@ mod tests {
     use bb8::Pool;
     use db_pool::{
         r#async::{
-            // import connection pool
-            ConnectionPool,
             DatabasePool,
             DatabasePoolBuilderTrait,
             DieselAsyncPostgresBackend,
             DieselBb8,
-            // import reusable object wrapper
-            Reusable,
+            // import reusable connection pool
+            ReusableConnectionPool,
         },
         PrivilegedPostgresConfig,
     };
@@ -25,7 +23,7 @@ mod tests {
 
     // change return type
     async fn get_connection_pool(
-    ) -> Reusable<'static, ConnectionPool<DieselAsyncPostgresBackend<DieselBb8>>> {
+    ) -> ReusableConnectionPool<'static, DieselAsyncPostgresBackend<DieselBb8>> {
         static POOL: OnceCell<DatabasePool<DieselAsyncPostgresBackend<DieselBb8>>> =
             OnceCell::const_new();
 
@@ -60,6 +58,6 @@ mod tests {
             .await;
 
         // pull connection pool
-        db_pool.pull().await
+        db_pool.pull_immutable().await
     }
 }
diff --git a/book/src/tutorials/async/06.rs b/book/src/tutorials/async/06.rs
@@ -6,8 +6,8 @@ mod tests {
 
     use db_pool::{
         r#async::{
-            ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, DieselAsyncPostgresBackend,
-            DieselBb8, Reusable,
+            DatabasePool, DatabasePoolBuilderTrait, DieselAsyncPostgresBackend, DieselBb8,
+            ReusableConnectionPool,
         },
         PrivilegedPostgresConfig,
     };
@@ -19,7 +19,7 @@ mod tests {
     use tokio::sync::OnceCell;
 
     async fn get_connection_pool(
-    ) -> Reusable<'static, ConnectionPool<DieselAsyncPostgresBackend<DieselBb8>>> {
+    ) -> ReusableConnectionPool<'static, DieselAsyncPostgresBackend<DieselBb8>> {
         static POOL: OnceCell<DatabasePool<DieselAsyncPostgresBackend<DieselBb8>>> =
             OnceCell::const_new();
 
@@ -53,7 +53,7 @@ mod tests {
             })
             .await;
 
-        db_pool.pull().await
+        db_pool.pull_immutable().await
     }
 
     // add test case

diff --git a/book/src/tutorials/async/07.rs b/book/src/tutorials/async/07.rs
@@ -8,8 +8,8 @@ mod tests {
     use bb8::Pool;
     use db_pool::{
         r#async::{
-            ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, DieselAsyncPostgresBackend,
-            DieselBb8, Reusable,
+            DatabasePool, DatabasePoolBuilderTrait, DieselAsyncPostgresBackend, DieselBb8,
+            ReusableConnectionPool,
         },
         PrivilegedPostgresConfig,
     };
@@ -21,7 +21,7 @@ mod tests {
     use tokio_shared_rt::test;
 
     async fn get_connection_pool(
-    ) -> Reusable<'static, ConnectionPool<DieselAsyncPostgresBackend<DieselBb8>>> {
+    ) -> ReusableConnectionPool<'static, DieselAsyncPostgresBackend<DieselBb8>> {
         static POOL: OnceCell<DatabasePool<DieselAsyncPostgresBackend<DieselBb8>>> =
             OnceCell::const_new();
 
@@ -55,7 +55,7 @@ mod tests {
             })
             .await;
 
-        db_pool.pull().await
+        db_pool.pull_immutable().await
     }
 
     async fn test() {

diff --git a/book/src/tutorials/sync/05.rs b/book/src/tutorials/sync/05.rs
@@ -8,13 +8,11 @@ mod tests {
 
     use db_pool::{
         sync::{
-            // import connection pool
-            ConnectionPool,
             DatabasePool,
             DatabasePoolBuilderTrait,
             DieselPostgresBackend,
-            // import reusable object wrapper
-            Reusable,
+            // import reusable connection pool
+            ReusableConnectionPool,
         },
         PrivilegedPostgresConfig,
     };
@@ -23,7 +21,7 @@ mod tests {
     use r2d2::Pool;
 
     // change return type
-    fn get_connection_pool() -> Reusable<'static, ConnectionPool<DieselPostgresBackend>> {
+    fn get_connection_pool() -> ReusableConnectionPool<'static, DieselPostgresBackend> {
         static POOL: OnceLock<DatabasePool<DieselPostgresBackend>> = OnceLock::new();
 
         let db_pool = POOL.get_or_init(|| {
@@ -47,6 +45,6 @@ mod tests {
         });
 
         // pull connection pool
-        db_pool.pull()
+        db_pool.pull_immutable()
     }
 }
diff --git a/book/src/tutorials/sync/06.rs b/book/src/tutorials/sync/06.rs
@@ -8,7 +8,7 @@ mod tests {
 
     use db_pool::{
         sync::{
-            ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, DieselPostgresBackend, Reusable,
+            DatabasePool, DatabasePoolBuilderTrait, DieselPostgresBackend, ReusableConnectionPool,
         },
         PrivilegedPostgresConfig,
     };
@@ -17,7 +17,7 @@ mod tests {
     use dotenvy::dotenv;
     use r2d2::Pool;
 
-    fn get_connection_pool() -> Reusable<'static, ConnectionPool<DieselPostgresBackend>> {
+    fn get_connection_pool() -> ReusableConnectionPool<'static, DieselPostgresBackend> {
         static POOL: OnceLock<DatabasePool<DieselPostgresBackend>> = OnceLock::new();
 
         let db_pool = POOL.get_or_init(|| {
@@ -40,7 +40,7 @@ mod tests {
             backend.create_database_pool().unwrap()
         });
 
-        db_pool.pull()
+        db_pool.pull_immutable()
     }
 
     // add test case

diff --git a/book/src/tutorials/sync/07.rs b/book/src/tutorials/sync/07.rs
@@ -6,15 +6,15 @@ mod tests {
 
     use db_pool::{
         sync::{
-            ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, DieselPostgresBackend, Reusable,
+            DatabasePool, DatabasePoolBuilderTrait, DieselPostgresBackend, ReusableConnectionPool,
         },
         PrivilegedPostgresConfig,
     };
     use diesel::{insert_into, sql_query, table, Insertable, QueryDsl, RunQueryDsl};
     use dotenvy::dotenv;
     use r2d2::Pool;
 
-    fn get_connection_pool() -> Reusable<'static, ConnectionPool<DieselPostgresBackend>> {
+    fn get_connection_pool() -> ReusableConnectionPool<'static, DieselPostgresBackend> {
         static POOL: OnceLock<DatabasePool<DieselPostgresBackend>> = OnceLock::new();
 
         let db_pool = POOL.get_or_init(|| {
@@ -37,7 +37,7 @@ mod tests {
             backend.create_database_pool().unwrap()
         });
 
-        db_pool.pull()
+        db_pool.pull_immutable()
     }
 
     fn test() {

diff --git a/examples/async-graphql/main.rs b/examples/async-graphql/main.rs
@@ -189,7 +189,7 @@ mod tests {
             })
             .await;
 
-        let conn_pool = db_pool.pull().await;
+        let conn_pool = db_pool.pull_immutable().await;
         PoolWrapper::ReusablePool(conn_pool)
     }
 

diff --git a/examples/diesel_async_mysql.rs b/examples/diesel_async_mysql.rs
@@ -7,8 +7,8 @@ mod tests {
     use bb8::Pool;
     use db_pool::{
         r#async::{
-            ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, DieselAsyncMySQLBackend,
-            DieselBb8, Reusable,
+            DatabasePool, DatabasePoolBuilderTrait, DieselAsyncMySQLBackend, DieselBb8,
+            ReusableConnectionPool,
         },
         PrivilegedMySQLConfig,
     };
@@ -19,7 +19,7 @@ mod tests {
     use tokio_shared_rt::test;
 
     async fn get_connection_pool(
-    ) -> Reusable<'static, ConnectionPool<DieselAsyncMySQLBackend<DieselBb8>>> {
+    ) -> ReusableConnectionPool<'static, DieselAsyncMySQLBackend<DieselBb8>> {
         static POOL: OnceCell<DatabasePool<DieselAsyncMySQLBackend<DieselBb8>>> =
             OnceCell::const_new();
 
@@ -51,7 +51,7 @@ mod tests {
             })
             .await;
 
-        db_pool.pull().await
+        db_pool.pull_immutable().await
     }
 
     async fn test() {

diff --git a/examples/diesel_async_postgres.rs b/examples/diesel_async_postgres.rs
@@ -7,8 +7,8 @@ mod tests {
     use bb8::Pool;
     use db_pool::{
         r#async::{
-            ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, DieselAsyncPostgresBackend,
-            DieselBb8, Reusable,
+            DatabasePool, DatabasePoolBuilderTrait, DieselAsyncPostgresBackend, DieselBb8,
+            ReusableConnectionPool,
         },
         PrivilegedPostgresConfig,
     };
@@ -19,7 +19,7 @@ mod tests {
     use tokio_shared_rt::test;
 
     async fn get_connection_pool(
-    ) -> Reusable<'static, ConnectionPool<DieselAsyncPostgresBackend<DieselBb8>>> {
+    ) -> ReusableConnectionPool<'static, DieselAsyncPostgresBackend<DieselBb8>> {
         static POOL: OnceCell<DatabasePool<DieselAsyncPostgresBackend<DieselBb8>>> =
             OnceCell::const_new();
 
@@ -53,7 +53,7 @@ mod tests {
             })
             .await;
 
-        db_pool.pull().await
+        db_pool.pull_immutable().await
     }
 
     async fn test() {

diff --git a/examples/diesel_mysql.rs b/examples/diesel_mysql.rs
@@ -6,15 +6,15 @@ mod tests {
 
     use db_pool::{
         sync::{
-            ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, DieselMySQLBackend, Reusable,
+            DatabasePool, DatabasePoolBuilderTrait, DieselMySQLBackend, ReusableConnectionPool,
         },
         PrivilegedMySQLConfig,
     };
     use diesel::{insert_into, sql_query, table, Insertable, QueryDsl, RunQueryDsl};
     use dotenvy::dotenv;
     use r2d2::Pool;
 
-    fn get_connection_pool() -> Reusable<'static, ConnectionPool<DieselMySQLBackend>> {
+    fn get_connection_pool() -> ReusableConnectionPool<'static, DieselMySQLBackend> {
         static POOL: OnceLock<DatabasePool<DieselMySQLBackend>> = OnceLock::new();
 
         let db_pool = POOL.get_or_init(|| {
@@ -37,7 +37,7 @@ mod tests {
             backend.create_database_pool().unwrap()
         });
 
-        db_pool.pull()
+        db_pool.pull_immutable()
     }
 
     fn test() {

diff --git a/examples/diesel_postgres.rs b/examples/diesel_postgres.rs
@@ -6,15 +6,15 @@ mod tests {
 
     use db_pool::{
         sync::{
-            ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, DieselPostgresBackend, Reusable,
+            DatabasePool, DatabasePoolBuilderTrait, DieselPostgresBackend, ReusableConnectionPool,
         },
         PrivilegedPostgresConfig,
     };
     use diesel::{insert_into, sql_query, table, Insertable, QueryDsl, RunQueryDsl};
     use dotenvy::dotenv;
     use r2d2::Pool;
 
-    fn get_connection_pool() -> Reusable<'static, ConnectionPool<DieselPostgresBackend>> {
+    fn get_connection_pool() -> ReusableConnectionPool<'static, DieselPostgresBackend> {
         static POOL: OnceLock<DatabasePool<DieselPostgresBackend>> = OnceLock::new();
 
         let db_pool = POOL.get_or_init(|| {
@@ -37,7 +37,7 @@ mod tests {
             backend.create_database_pool().unwrap()
         });
 
-        db_pool.pull()
+        db_pool.pull_immutable()
     }
 
     fn test() {

diff --git a/examples/mysql.rs b/examples/mysql.rs
@@ -5,14 +5,14 @@ mod tests {
     use std::sync::OnceLock;
 
     use db_pool::{
-        sync::{ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, MySQLBackend, Reusable},
+        sync::{DatabasePool, DatabasePoolBuilderTrait, MySQLBackend, ReusableConnectionPool},
         PrivilegedMySQLConfig,
     };
     use dotenvy::dotenv;
     use mysql::{params, prelude::Queryable};
     use r2d2::Pool;
 
-    fn get_connection_pool() -> Reusable<'static, ConnectionPool<MySQLBackend>> {
+    fn get_connection_pool() -> ReusableConnectionPool<'static, MySQLBackend> {
         static POOL: OnceLock<DatabasePool<MySQLBackend>> = OnceLock::new();
 
         let db_pool = POOL.get_or_init(|| {
@@ -36,7 +36,7 @@ mod tests {
             backend.create_database_pool().unwrap()
         });
 
-        db_pool.pull()
+        db_pool.pull_immutable()
     }
 
     fn test() {

diff --git a/examples/postgres.rs b/examples/postgres.rs
@@ -5,13 +5,13 @@ mod tests {
     use std::sync::OnceLock;
 
     use db_pool::{
-        sync::{ConnectionPool, DatabasePool, DatabasePoolBuilderTrait, PostgresBackend, Reusable},
+        sync::{DatabasePool, DatabasePoolBuilderTrait, PostgresBackend, ReusableConnectionPool},
         PrivilegedPostgresConfig,
     };
     use dotenvy::dotenv;
     use r2d2::Pool;
 
-    fn get_connection_pool() -> Reusable<'static, ConnectionPool<PostgresBackend>> {
+    fn get_connection_pool() -> ReusableConnectionPool<'static, PostgresBackend> {
         static POOL: OnceLock<DatabasePool<PostgresBackend>> = OnceLock::new();
 
         let db_pool = POOL.get_or_init(|| {
@@ -36,7 +36,7 @@ mod tests {
             backend.create_database_pool().unwrap()
         });
 
-        db_pool.pull()
+        db_pool.pull_immutable()
     }
 
     fn test() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -189,7 +189,7 @@ mod tests { @@
                 })
                 .await;
-            let conn_pool = db_pool.pull().await;
+            let conn_pool = db_pool.pull_immutable().await;
             PoolWrapper::ReusablePool(conn_pool)
         }
@@ Expand Down @@