Fix naming issue

Author: owjs3901

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

@@ -121,9 +121,11 @@ pub fn build_add_column(
         let mut index_queries = Vec::new();
         for constraint in &table_def.constraints {
             if let vespertide_core::TableConstraint::Index { name, columns } = constraint {
-                let index_name = name
-                    .clone()
-                    .unwrap_or_else(|| format!("ix_{}_{}", table, columns.join("_")));
+                let index_name = vespertide_naming::build_index_name(
+                    table,
+                    columns,
+                    name.as_deref(),
+                );
                 let mut idx_stmt = sea_query::Index::create();
                 idx_stmt = idx_stmt.name(&index_name).to_owned();
                 for col_name in columns {

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

@@ -83,9 +83,11 @@ pub fn build_modify_column_type(
         let mut index_queries = Vec::new();
         for constraint in &table_def.constraints {
             if let vespertide_core::TableConstraint::Index { name, columns } = constraint {
-                let index_name = name
-                    .clone()
-                    .unwrap_or_else(|| format!("ix_{}_{}", table, columns.join("_")));
+                let index_name = vespertide_naming::build_index_name(
+                    table,
+                    columns,
+                    name.as_deref(),
+                );
                 let mut idx_stmt = sea_query::Index::create();
                 idx_stmt = idx_stmt.name(&index_name).to_owned();
                 for col_name in columns {

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

@@ -77,9 +77,11 @@ pub fn build_remove_constraint(
                         columns: idx_cols,
                     } = constraint
                     {
-                        let index_name = idx_name
-                            .clone()
-                            .unwrap_or_else(|| format!("ix_{}_{}", table, idx_cols.join("_")));
+                        let index_name = vespertide_naming::build_index_name(
+                            table,
+                            idx_cols,
+                            idx_name.as_deref(),
+                        );
                         let mut idx_stmt = sea_query::Index::create();
                         idx_stmt = idx_stmt.name(&index_name).to_owned();
                         for col_name in idx_cols {
@@ -717,7 +719,7 @@ mod tests {
 
         if matches!(backend, DatabaseBackend::Sqlite) {
             assert!(sql.contains("CREATE INDEX"));
-            assert!(sql.contains("idx_id"));
+            assert!(sql.contains("ix_users__idx_id"));
         }
 
         with_settings!({ snapshot_suffix => format!("remove_primary_key_with_index_{:?}", backend) }, {
@@ -905,7 +907,7 @@ mod tests {
 
         if matches!(backend, DatabaseBackend::Sqlite) {
             assert!(sql.contains("CREATE INDEX"));
-            assert!(sql.contains("idx_id"));
+            assert!(sql.contains("ix_users__idx_id"));
         }
 
         with_settings!({ snapshot_suffix => format!("remove_unique_with_index_{:?}", backend) }, {

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__modify_column_type__tests__modify_column_type_with_index@modify_column_type_with_index_modify_column_type_with_index_sqlite.snap

@@ -6,4 +6,4 @@ CREATE TABLE "users_temp" ( "id" integer NOT NULL, "age" bigint );
 INSERT INTO "users_temp" ("id", "age") SELECT "id", "age" FROM "users";
 DROP TABLE "users";
 ALTER TABLE "users_temp" RENAME TO "users";
-CREATE INDEX "idx_age" ON "users" ("age")
+CREATE INDEX "ix_users__idx_age" ON "users" ("age")

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__remove_constraint__tests__remove_constraint_primary_key_with_index@remove_primary_key_with_index_Sqlite.snap

@@ -6,4 +6,4 @@ CREATE TABLE "users_temp" ( "id" integer NOT NULL )
 INSERT INTO "users_temp" ("id") SELECT "id" FROM "users"
 DROP TABLE "users"
 ALTER TABLE "users_temp" RENAME TO "users"
-CREATE INDEX "idx_id" ON "users" ("id")
+CREATE INDEX "ix_users__idx_id" ON "users" ("id")