-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
editoast: refactor connection pool for tests
- Loading branch information
Showing
8 changed files
with
238 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
editoast/src/modelsv2/connection_pool/db_connection_error.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| use reqwest::StatusCode; | ||
| use thiserror::Error; | ||
|
|
||
| use crate::error::EditoastError; | ||
|
|
||
| #[derive(Debug, Error)] | ||
| pub enum DbConnectionError { | ||
| #[error(transparent)] | ||
| DeadpoolPool(diesel_async::pooled_connection::deadpool::PoolError), | ||
| #[error(transparent)] | ||
| #[allow(dead_code)] | ||
| DieselError(diesel::result::Error), | ||
| #[allow(dead_code)] | ||
| #[error("Test connection not initialized")] | ||
| TestConnection, | ||
| } | ||
|
|
||
| impl EditoastError for DbConnectionError { | ||
| fn get_status(&self) -> StatusCode { | ||
| StatusCode::INTERNAL_SERVER_ERROR | ||
| } | ||
|
|
||
| fn get_type(&self) -> &str { | ||
| "editoast:ConnectionPoolError" | ||
| } | ||
| } |
77 changes: 77 additions & 0 deletions
77
editoast/src/modelsv2/connection_pool/db_connection_pool.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| use diesel_async::pooled_connection::deadpool::Object; | ||
| use diesel_async::pooled_connection::deadpool::Pool; | ||
|
|
||
| use diesel_async::AsyncPgConnection; | ||
| use std::sync::Arc; | ||
| #[cfg(test)] | ||
| use tokio::sync::OwnedRwLockWriteGuard; | ||
| #[cfg(test)] | ||
| use tokio::sync::RwLock; | ||
| use url::Url; | ||
|
|
||
| use super::DbConnectionError; | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct DbConnectionPoolV2 { | ||
| pub pool: Arc<Pool<AsyncPgConnection>>, | ||
| #[cfg(test)] | ||
| pub test_connection: Option<Arc<RwLock<Object<AsyncPgConnection>>>>, | ||
| } | ||
|
|
||
| impl DbConnectionPoolV2 { | ||
| #[cfg(test)] | ||
| pub async fn create(pool: Pool<AsyncPgConnection>) -> Result<Self, DbConnectionError> { | ||
| use diesel_async::AsyncConnection; | ||
| use tokio::sync::RwLock; | ||
| let mut conn = pool.get().await.map_err(DbConnectionError::DeadpoolPool)?; | ||
| conn.begin_test_transaction() | ||
| .await | ||
| .map_err(DbConnectionError::DieselError)?; | ||
| let test_connection = Arc::new(RwLock::new(conn)); | ||
|
|
||
| Ok(Self { | ||
| pool: Arc::new(pool), | ||
| test_connection: Some(test_connection), | ||
| }) | ||
| } | ||
|
|
||
| #[cfg(not(test))] | ||
| pub async fn create(pool: Pool<AsyncPgConnection>) -> Result<Self, DbConnectionError> { | ||
| Ok(Self { | ||
| pool: Arc::new(pool), | ||
| }) | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| pub async fn create_from_url(url: Url, pool_size: usize) -> Result<Self, DbConnectionError> { | ||
| use diesel_async::pooled_connection::AsyncDieselConnectionManager; | ||
| let manager = AsyncDieselConnectionManager::<AsyncPgConnection>::new(url.as_str()); | ||
| let pool = Pool::builder(manager) | ||
| .max_size(pool_size) | ||
| .build() | ||
| .expect("Failed to create pool."); | ||
| Ok(Self::create(pool).await?) | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| pub async fn get( | ||
| &self, | ||
| ) -> Result<OwnedRwLockWriteGuard<Object<AsyncPgConnection>>, DbConnectionError> { | ||
| if let Some(test_connection) = &self.test_connection { | ||
| let connection = test_connection.clone().write_owned().await; | ||
| Ok(connection) | ||
| } else { | ||
| Err(DbConnectionError::TestConnection) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(not(test))] | ||
| pub async fn get(&self) -> Result<Object<AsyncPgConnection>, DbConnectionError> { | ||
| let co = self | ||
| .pool | ||
| .get() | ||
| .await | ||
| .map_err(DbConnectionError::DeadpoolPool)?; | ||
| Ok(co) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.