Refactor inline

Author: owjs3901

crates/vespertide-core/src/schema/table.rs

@@ -773,7 +773,7 @@ mod tests {
         assert_eq!(idx_b.1, vec!["col3".to_string()]);
 
         // Check auto-generated index for col4 (should have name: None)
-        let idx_col4 = indexes.iter().find(|(n, _)| n == &None).unwrap();
+        let idx_col4 = indexes.iter().find(|(n, _)| n.is_none()).unwrap();
         assert_eq!(idx_col4.1, vec!["col4".to_string()]);
     }
 

crates/vespertide-exporter/src/seaorm/mod.rs

@@ -107,10 +107,10 @@ fn single_column_unique_set(constraints: &[TableConstraint]) -> HashSet<String>
 fn single_column_index_set(constraints: &[TableConstraint]) -> HashSet<String> {
     let mut indexed_cols = HashSet::new();
     for constraint in constraints {
-        if let TableConstraint::Index { columns, .. } = constraint {
-            if columns.len() == 1 {
-                indexed_cols.insert(columns[0].clone());
-            }
+        if let TableConstraint::Index { columns, .. } = constraint
+            && columns.len() == 1
+        {
+            indexed_cols.insert(columns[0].clone());
         }
     }
     indexed_cols

crates/vespertide-planner/src/apply.rs

@@ -177,8 +177,11 @@ pub fn apply_action(
                     // Clear inline index on columns when removing an index constraint
                     // Check if this index name was auto-generated for a single column
                     for col in &mut tbl.columns {
-                        let auto_name =
-                            vespertide_naming::build_index_name(table, &[col.name.clone()], None);
+                        let auto_name = vespertide_naming::build_index_name(
+                            table,
+                            std::slice::from_ref(&col.name),
+                            None,
+                        );
                         if name.as_ref() == Some(&auto_name) {
                             col.index = None;
                             break;

crates/vespertide-planner/src/diff.rs

@@ -380,11 +380,7 @@ mod tests {
     use rstest::rstest;
     use vespertide_core::{
         ColumnDef, ColumnType, MigrationAction, SimpleColumnType,
-        schema::{
-            foreign_key::{ForeignKeyDef, ForeignKeySyntax},
-            primary_key::PrimaryKeySyntax,
-            str_or_bool::StrOrBoolOrArray,
-        },
+        schema::{primary_key::PrimaryKeySyntax, str_or_bool::StrOrBoolOrArray},
     };
 
     fn col(name: &str, ty: ColumnType) -> ColumnDef {
@@ -1684,7 +1680,7 @@ mod tests {
     }
 
     mod index {
-        use insta::{Snapshot, assert_debug_snapshot};
+        use insta::assert_debug_snapshot;
 
         use super::*;
 

…reate_table_with_inline_index-2.snap.new …x__create_table_with_inline_index-2.snapcrates/vespertide-planner/src/snapshots/vespertide_planner__diff__tests__index__create_table_with_inline_index-2.snap.new renamed to crates/vespertide-planner/src/snapshots/vespertide_planner__diff__tests__index__create_table_with_inline_index-2.snap crates/vespertide-planner/src/snapshots/vespertide_planner__diff__tests__index__create_table_with_inline_index-2.snap.new renamed to crates/vespertide-planner/src/snapshots/vespertide_planner__diff__tests__index__create_table_with_inline_index-2.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/vespertide-planner/src/diff.rs
-assertion_line: 1723
 expression: plan.actions
 ---
 [

crates/vespertide-query/src/sql/create_table.rs

@@ -228,7 +228,7 @@ pub fn build_create_table(
         } = constraint
         {
             // Always generate a proper name: ix_{table}_{key} or ix_{table}_{columns}
-            let index_name = super::helpers::build_index_name(table, &index_cols, name.as_deref());
+            let index_name = super::helpers::build_index_name(table, index_cols, name.as_deref());
             let mut idx = Index::create()
                 .table(Alias::new(table))
                 .name(&index_name)