Update Removed value

Author: owjs3901

.changepacks/changepack_log_xaH0zQKa0SNDneIezZ7HM.json

@@ -0,0 +1 @@
+{"changes":{"crates/vespertide-planner/Cargo.toml":"Patch","crates/vespertide-macro/Cargo.toml":"Patch","crates/vespertide-cli/Cargo.toml":"Patch","crates/vespertide-exporter/Cargo.toml":"Patch","crates/vespertide-loader/Cargo.toml":"Patch","crates/vespertide/Cargo.toml":"Patch","crates/vespertide-naming/Cargo.toml":"Patch","crates/vespertide-config/Cargo.toml":"Patch","crates/vespertide-query/Cargo.toml":"Patch","crates/vespertide-core/Cargo.toml":"Patch"},"note":"Update removed enum","date":"2026-02-20T18:28:10.423539700Z"}

Cargo.lock

@@ -85,6 +85,7 @@ fn format_action(action: &MigrationAction) -> String {
             table,
             column,
             new_type,
+            ..
         } => {
             format!(
                 "{} {}.{} {} {}",
@@ -329,6 +330,7 @@ mod tests {
             table: "users".into(),
             column: "id".into(),
             new_type: ColumnType::Simple(SimpleColumnType::Integer),
+            fill_with: None,
         },
         format!("{} {}.{} {} {}", "Modify column type:".bright_yellow(), "users".bright_cyan(), "id".bright_cyan().bold(), "->".bright_white(), "integer".bright_cyan().bold())
     )]

crates/vespertide-cli/src/commands/diff.rs

@@ -273,6 +273,7 @@ mod tests {
                     table: "users".into(),
                     column: "id".into(),
                     new_type: ColumnType::Simple(SimpleColumnType::BigInt),
+                    fill_with: None,
                 },
             ],
         };

crates/vespertide-cli/src/commands/log.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 use std::path::Path;
 
 use anyhow::{Context, Result};
@@ -9,7 +9,10 @@ use serde_json::Value;
 use tokio::fs;
 use vespertide_config::FileFormat;
 use vespertide_core::{MigrationAction, MigrationPlan, TableConstraint, TableDef};
-use vespertide_planner::{find_missing_fill_with, plan_next_migration, schema_from_plans};
+use vespertide_planner::{
+    find_missing_enum_fill_with, find_missing_fill_with, plan_next_migration, schema_from_plans,
+    EnumFillWithRequired,
+};
 
 use crate::utils::{
     load_config, load_migrations, load_models, migration_filename_with_format_and_pattern,
@@ -226,6 +229,90 @@ where
     Ok(())
 }
 
+/// Collect enum fill_with values interactively for removed enum values.
+/// The `enum_prompt_fn` parameter handles enum type columns with selection UI.
+fn collect_enum_fill_with_values<E>(
+    missing: &[EnumFillWithRequired],
+    enum_prompt_fn: E,
+) -> Result<Vec<(usize, BTreeMap<String, String>)>>
+where
+    E: Fn(&str, &[String]) -> Result<String>,
+{
+    let mut results = Vec::new();
+
+    println!(
+        "\n{} {}",
+        "\u{26a0}".bright_yellow(),
+        "The following enum value removals require replacement mappings:".bright_yellow()
+    );
+    println!("{}", "\u{2500}".repeat(60).bright_black());
+
+    for item in missing {
+        println!(
+            "  {} {}.{}: removing enum values",
+            "\u{2022}".bright_cyan(),
+            item.table.bright_white(),
+            item.column.bright_green()
+        );
+
+        let mut mappings = BTreeMap::new();
+        for removed in &item.removed_values {
+            let prompt = format!(
+                "  Replace '{}' in {}.{} with",
+                removed.bright_red(),
+                item.table.bright_white(),
+                item.column.bright_green()
+            );
+            let value = enum_prompt_fn(&prompt, &item.remaining_values)?;
+            mappings.insert(removed.clone(), value);
+        }
+        results.push((item.action_index, mappings));
+    }
+
+    println!("{}", "\u{2500}".repeat(60).bright_black());
+    Ok(results)
+}
+
+/// Apply collected enum fill_with mappings to the migration plan.
+fn apply_enum_fill_with_to_plan(
+    plan: &mut MigrationPlan,
+    collected: &[(usize, BTreeMap<String, String>)],
+) {
+    for (action_index, mappings) in collected {
+        if let Some(MigrationAction::ModifyColumnType { fill_with, .. }) =
+            plan.actions.get_mut(*action_index)
+        {
+            match fill_with {
+                Some(existing) => {
+                    existing.extend(mappings.clone());
+                }
+                None => {
+                    *fill_with = Some(mappings.clone());
+                }
+            }
+        }
+    }
+}
+
+/// Handle interactive enum fill_with collection if there are missing values.
+fn handle_missing_enum_fill_with<E>(
+    plan: &mut MigrationPlan,
+    current_schema: &[TableDef],
+    enum_prompt_fn: E,
+) -> Result<()>
+where
+    E: Fn(&str, &[String]) -> Result<String>,
+{
+    let missing = find_missing_enum_fill_with(plan, current_schema);
+
+    if !missing.is_empty() {
+        let collected = collect_enum_fill_with_values(&missing, enum_prompt_fn)?;
+        apply_enum_fill_with_to_plan(plan, &collected);
+    }
+
+    Ok(())
+}
+
 /// Check that no AddColumn action adds a non-nullable FK column without a default.
 /// This is logically impossible: existing rows can't satisfy the FK constraint.
 fn check_non_nullable_fk_add_columns(plan: &MigrationPlan) -> Result<()> {
@@ -303,6 +390,9 @@ pub async fn cmd_revision(message: String, fill_with_args: Vec<String>) -> Resul
         prompt_enum_value,
     )?;
 
+    // Handle any missing enum fill_with values (for removed enum values) interactively
+    handle_missing_enum_fill_with(&mut plan, &baseline_schema, prompt_enum_value)?;
+
     plan.id = uuid::Uuid::new_v4().to_string();
     plan.comment = Some(message);
     if plan.created_at.is_none() {

crates/vespertide-cli/src/commands/revision.rs

@@ -1,6 +1,7 @@
 use crate::schema::{ColumnDef, ColumnName, ColumnType, TableConstraint, TableName};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use std::collections::BTreeMap;
 use std::fmt;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
@@ -47,6 +48,10 @@ pub enum MigrationAction {
         table: TableName,
         column: ColumnName,
         new_type: ColumnType,
+        /// Mapping of removed enum values to replacement values for safe enum value removal.
+        /// e.g., {"cancelled": "'pending'"} generates UPDATE before type change.
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        fill_with: Option<BTreeMap<String, String>>,
     },
     ModifyColumnNullable {
         table: TableName,
@@ -146,10 +151,12 @@ impl MigrationAction {
                 table,
                 column,
                 new_type,
+                fill_with,
             } => MigrationAction::ModifyColumnType {
                 table: format!("{}{}", prefix, table),
                 column,
                 new_type,
+                fill_with,
             },
             MigrationAction::ModifyColumnNullable {
                 table,
@@ -403,6 +410,7 @@ mod tests {
             table: "users".into(),
             column: "age".into(),
             new_type: ColumnType::Simple(SimpleColumnType::Integer),
+            fill_with: None,
         },
         "ModifyColumnType: users.age"
     )]
@@ -893,12 +901,14 @@ mod tests {
             table: "users".into(),
             column: "age".into(),
             new_type: ColumnType::Simple(SimpleColumnType::BigInt),
+            fill_with: None,
         };
         let prefixed = action.with_prefix("myapp_");
         if let MigrationAction::ModifyColumnType {
             table,
             column,
             new_type,
+            fill_with,
         } = prefixed
         {
             assert_eq!(table.as_str(), "myapp_users");
@@ -907,6 +917,7 @@ mod tests {
                 new_type,
                 ColumnType::Simple(SimpleColumnType::BigInt)
             ));
+            assert_eq!(fill_with, None);
         } else {
             panic!("Expected ModifyColumnType");
         }

crates/vespertide-core/src/action.rs

@@ -103,6 +103,7 @@ pub fn apply_action(
             table,
             column,
             new_type,
+            ..
         } => {
             let tbl = schema
                 .iter_mut()
@@ -641,6 +642,7 @@ mod tests {
                 table: "users".into(),
                 column: "id".into(),
                 new_type: ColumnType::Simple(SimpleColumnType::Text),
+                fill_with: None,
             },
             MigrationAction::AddConstraint {
                 table: "users".into(),

crates/vespertide-planner/src/apply.rs

@@ -361,6 +361,7 @@ fn sort_enum_default_dependencies(
                 table,
                 column,
                 new_type,
+                ..
             } => {
                 type_changes.insert((table.as_str(), column.as_str()), (i, new_type));
             }
@@ -488,6 +489,7 @@ pub fn diff_schemas(from: &[TableDef], to: &[TableDef]) -> Result<MigrationPlan,
                         table: name.to_string(),
                         column: col.to_string(),
                         new_type: to_def.r#type.clone(),
+                        fill_with: None,
                     });
                 }
             }
@@ -747,6 +749,7 @@ mod tests {
             table: "users".into(),
             column: "id".into(),
             new_type: ColumnType::Simple(SimpleColumnType::Text),
+            fill_with: None,
         }]
     )]
     #[case::remove_index(

crates/vespertide-planner/src/diff.rs

@@ -11,5 +11,6 @@ pub use error::PlannerError;
 pub use plan::{plan_next_migration, plan_next_migration_with_baseline};
 pub use schema::schema_from_plans;
 pub use validate::{
-    FillWithRequired, find_missing_fill_with, validate_migration_plan, validate_schema,
+    EnumFillWithRequired, FillWithRequired, find_missing_enum_fill_with, find_missing_fill_with,
+    validate_migration_plan, validate_schema,
 };