Fix naming snapshot

Author: owjs3901

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

@@ -268,10 +268,13 @@ pub fn build_add_constraint(
                 Ok(queries)
             } else {
                 // Build foreign key using ForeignKey::create
+                let fk_name = vespertide_naming::build_foreign_key_name(
+                    table,
+                    columns,
+                    name.as_deref(),
+                );
                 let mut fk = ForeignKey::create();
-                if let Some(n) = name {
-                    fk = fk.name(n).to_owned();
-                }
+                fk = fk.name(&fk_name).to_owned();
                 fk = fk.from_tbl(Alias::new(table)).to_owned();
                 for col in columns {
                     fk = fk.from_col(Alias::new(col)).to_owned();

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

@@ -345,11 +345,11 @@ pub fn build_remove_constraint(
                 Ok(queries)
             } else {
                 // Build foreign key drop using ForeignKey::drop()
-                let constraint_name = if let Some(n) = name {
-                    n.clone()
-                } else {
-                    format!("{}_{}_fkey", table, columns.join("_"))
-                };
+                let constraint_name = vespertide_naming::build_foreign_key_name(
+                    table,
+                    columns,
+                    name.as_deref(),
+                );
                 let fk_drop = ForeignKey::drop()
                     .name(&constraint_name)
                     .table(Alias::new(table))
@@ -514,12 +514,12 @@ mod tests {
     #[case::remove_constraint_foreign_key_named_postgres(
         "remove_constraint_foreign_key_named_postgres",
         DatabaseBackend::Postgres,
-        &["DROP CONSTRAINT \"fk_user\""]
+        &["DROP CONSTRAINT \"fk_users__fk_user\""]
     )]
     #[case::remove_constraint_foreign_key_named_mysql(
         "remove_constraint_foreign_key_named_mysql",
         DatabaseBackend::MySql,
-        &["DROP FOREIGN KEY `fk_user`"]
+        &["DROP FOREIGN KEY `fk_users__fk_user`"]
     )]
     #[case::remove_constraint_foreign_key_named_sqlite(
         "remove_constraint_foreign_key_named_sqlite",

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__add_constraint__tests__add_constraint@add_constraint_add_constraint_foreign_key_mysql.snap

@@ -2,4 +2,4 @@
 source: crates/vespertide-query/src/sql/add_constraint.rs
 expression: "result.iter().map(|q| q.build(backend)).collect::<Vec<String>>().join(\"\\n\")"
 ---
-ALTER TABLE `users` ADD CONSTRAINT `fk_user` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT
+ALTER TABLE `users` ADD CONSTRAINT `fk_users__fk_user` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__add_constraint__tests__add_constraint@add_constraint_add_constraint_foreign_key_postgres.snap

@@ -2,4 +2,4 @@
 source: crates/vespertide-query/src/sql/add_constraint.rs
 expression: "result.iter().map(|q| q.build(backend)).collect::<Vec<String>>().join(\"\\n\")"
 ---
-ALTER TABLE "users" ADD CONSTRAINT "fk_user" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE RESTRICT
+ALTER TABLE "users" ADD CONSTRAINT "fk_users__fk_user" FOREIGN KEY ("user_id") REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE RESTRICT

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__remove_constraint__tests__remove_constraint@remove_constraint_remove_constraint_foreign_key_named_mysql.snap

@@ -2,4 +2,4 @@
 source: crates/vespertide-query/src/sql/remove_constraint.rs
 expression: "result.iter().map(|q| q.build(backend)).collect::<Vec<String>>().join(\"\\n\")"
 ---
-ALTER TABLE `users` DROP FOREIGN KEY `fk_user`
+ALTER TABLE `users` DROP FOREIGN KEY `fk_users__fk_user`

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__remove_constraint__tests__remove_constraint@remove_constraint_remove_constraint_foreign_key_named_postgres.snap

@@ -2,4 +2,4 @@
 source: crates/vespertide-query/src/sql/remove_constraint.rs
 expression: "result.iter().map(|q| q.build(backend)).collect::<Vec<String>>().join(\"\\n\")"
 ---
-ALTER TABLE "users" DROP CONSTRAINT "fk_user"
+ALTER TABLE "users" DROP CONSTRAINT "fk_users__fk_user"

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__remove_constraint__tests__remove_constraint_foreign_key_with_index@remove_foreign_key_with_index_MySql.snap

@@ -2,4 +2,4 @@
 source: crates/vespertide-query/src/sql/remove_constraint.rs
 expression: sql
 ---
-ALTER TABLE `posts` DROP FOREIGN KEY `fk_user`
+ALTER TABLE `posts` DROP FOREIGN KEY `fk_posts__fk_user`

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__remove_constraint__tests__remove_constraint_foreign_key_with_index@remove_foreign_key_with_index_Postgres.snap

@@ -2,4 +2,4 @@
 source: crates/vespertide-query/src/sql/remove_constraint.rs
 expression: sql
 ---
-ALTER TABLE "posts" DROP CONSTRAINT "fk_user"
+ALTER TABLE "posts" DROP CONSTRAINT "fk_posts__fk_user"

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__remove_constraint__tests__remove_constraint_foreign_key_with_other_constraints@remove_foreign_key_with_other_constraints_MySql.snap

@@ -2,4 +2,4 @@
 source: crates/vespertide-query/src/sql/remove_constraint.rs
 expression: sql
 ---
-ALTER TABLE `posts` DROP FOREIGN KEY `fk_user`
+ALTER TABLE `posts` DROP FOREIGN KEY `fk_posts__fk_user`

crates/vespertide-query/src/sql/snapshots/vespertide_query__sql__remove_constraint__tests__remove_constraint_foreign_key_with_other_constraints@remove_foreign_key_with_other_constraints_Postgres.snap

@@ -2,4 +2,4 @@
 source: crates/vespertide-query/src/sql/remove_constraint.rs
 expression: sql
 ---
-ALTER TABLE "posts" DROP CONSTRAINT "fk_user"
+ALTER TABLE "posts" DROP CONSTRAINT "fk_posts__fk_user"