ed: revert error types

Author: leovalais

editoast/editoast_models/src/db_connection_pool.rs

@@ -131,20 +131,8 @@ impl Default for DbConnectionPoolV2 {
 pub struct DatabasePoolBuildError(#[from] diesel_async::pooled_connection::deadpool::BuildError);
 
 #[derive(Debug, thiserror::Error)]
-pub enum DatabasePoolError {
-    #[error("an error occurred while getting a connection from the database pool: '{0}'")]
-    Pool(#[from] diesel_async::pooled_connection::deadpool::PoolError),
-    #[error("an error occured while querying the database: {0}")]
-    DieselError(#[from] diesel::result::Error),
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum DatabaseTransactionError {
-    #[error("an error occurred while getting a connection from the database pool: '{0}'")]
-    Pool(#[from] DatabasePoolError),
-    #[error("an error occured while querying the database: {0}")]
-    DieselError(#[from] diesel::result::Error),
-}
+#[error("an error occurred while getting a connection from the database pool: '{0}'")]
+pub struct DatabasePoolError(#[from] diesel_async::pooled_connection::deadpool::PoolError);
 
 impl DbConnectionPoolV2 {
     /// Get inner pool for retro compatibility

editoast/editoast_models/src/lib.rs

@@ -1,4 +1,3 @@
-use db_connection_pool::DatabasePoolError;
 use diesel_async::pooled_connection::deadpool::Pool;
 use diesel_async::AsyncPgConnection;
 
@@ -15,9 +14,5 @@ pub type DbConnectionPool = Pool<DieselConnection>;
 ///
 /// Useful for functions which only points of failure are the DB calls.
 #[derive(Debug, thiserror::Error)]
-pub enum DatabaseError {
-    #[error("an error occured while querying the database: {0}")]
-    DieselError(#[from] diesel::result::Error),
-    #[error("an error occured while retrieving a connection from the pool: {0}")]
-    DatabasePoolError(#[from] DatabasePoolError),
-}
+#[error("an error occured while querying the database: {0}")]
+pub struct DatabaseError(#[from] diesel::result::Error);