Adjusted error handling to new error type

Author: gammelalf

src/migrate/apply.rs

@@ -7,7 +7,7 @@ use rorm_db::sql::drop_table::DropTable;
 use rorm_db::sql::insert::Insert;
 use rorm_db::sql::value::Value;
 use rorm_db::sql::DBImpl;
-use rorm_db::transaction::Transaction;
+use rorm_db::transaction::{Transaction, TransactionError};
 use rorm_db::Database;
 use rorm_declaration::migration::{Migration, Operation};
 use thiserror::Error;
@@ -59,8 +59,11 @@ pub async fn apply_migration(
             location: ApplyMigrationErrorLocation::UpdateLastMigration,
         })?;
 
-    tx.commit().await.map_err(|error| ApplyMigrationError {
-        error,
+    tx.commit().await.map_err(|x| ApplyMigrationError {
+        error: match x {
+            TransactionError::Database(x) => x,
+            TransactionError::Hook(_) => unreachable!("rorm-cli does not use hooks"),
+        },
         location: ApplyMigrationErrorLocation::CommitTransaction,
     })?;
 

src/migrate/mod.rs

@@ -4,6 +4,7 @@ use std::path::Path;
 use anyhow::{anyhow, Context};
 use rorm_db::executor::{Executor, Nothing, Optional};
 use rorm_db::sql::create_table::CreateTable;
+use rorm_db::transaction::TransactionError;
 use rorm_db::Database;
 use rorm_declaration::config::DatabaseConfig;
 use rorm_declaration::imr::{Annotation, DbType};
@@ -101,6 +102,10 @@ pub async fn run_migrate_custom(
 
     tx.commit()
         .await
+        .map_err(|x| match x {
+            TransactionError::Database(x) => x,
+            TransactionError::Hook(_) => unreachable!("rorm-cli does not use hooks"),
+        })
         .with_context(|| "Couldn't create internal last migration table")?;
 
     let last_migration: Option<i32> = pool