Fix revert and undo

src/commands/revert.rs

@@ -2,7 +2,11 @@ use crate::{
     errors::CLIError,
     operators::{
         clickhouse_operators::{
-            check_if_migrations_table_exists, get_clickhouse_client_and_ping, undo_migration,
+            check_if_migrations_table_exists,
+            get_clickhouse_client_and_ping,
+            get_migrations_from_clickhouse,
+            undo_migration,
+            get_last_migration_from_clickhouse,
         },
         migrations_operators::get_migrations_from_dir,
     },
@@ -14,23 +18,24 @@ pub async fn revert_commmand() -> Result<(), CLIError> {
     let client = get_clickhouse_client_and_ping(config).await?;
 
     if !(check_if_migrations_table_exists(client.clone()).await?) {
-        return Err(CLIError::BadArgs(
-            "Migrations table does not exist. Run chm setup first!".to_string(),
-        ));
+        return Err(CLIError::InternalError("Migrations table does not exist".to_string()));
     }
 
-    let local_migrations = get_migrations_from_dir().await?;
+    let last = get_last_migration_from_clickhouse(client.clone())
+        .await?
+        .ok_or_else(|| CLIError::InternalError("No migrations to revert".to_string()))?;
 
-    undo_migration(
-        client.clone(),
-        local_migrations
-            .last()
-            .ok_or(CLIError::InternalError(
-                "No migrations to revert".to_string(),
-            ))?
-            .clone(),
-    )
-    .await?;
+    let local = get_migrations_from_dir().await?;
+    let migration = local
+        .into_iter()
+        .find(|m| m.version == last.version)
+        .ok_or_else(|| {
+            CLIError::InternalError(format!(
+                "Migration {} is applied in DB but not found on disk",
+                last.version
+            ))
+        })?;
 
+    undo_migration(client.clone(), migration).await?;
     Ok(())
 }

src/operators/clickhouse_operators.rs

@@ -120,12 +120,11 @@ pub async fn undo_migration(
     migration: MigrationOnDisk,
 ) -> Result<(), CLIError> {
     let down_query = migration.get_down_query().await?;
-    let mut queries = down_query
+    let queries = down_query
         .split(';')
+        .map(|s| s.trim())
         .filter(|s| !s.is_empty())
-        .collect::<Vec<&str>>();
-
-    queries.truncate(queries.len().saturating_sub(1));
+        .collect::<Vec<_>>();
 
     println!("Reverting migration {}", migration.name);
 
@@ -147,3 +146,13 @@ pub async fn undo_migration(
     Ok(())
 }
 
+pub async fn get_last_migration_from_clickhouse(
+    client: clickhouse::Client,
+) -> Result<Option<MigrationRow>, CLIError> {
+    let mut rows = client
+        .query("SELECT ?fields FROM ch_migrations ORDER BY ran_at DESC, version DESC LIMIT 1")
+        .fetch_all::<MigrationRow>()
+        .await?;
+
+    Ok(rows.pop())
+}