From c9c1458df198b6e9008daf5f41a6bc756725bd89 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 8 Sep 2020 09:09:49 +0100 Subject: [PATCH] Bug 22343: (QA follow-up) Ensure FK names don't conflict Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- installer/data/mysql/atomicupdate/bug_22343_smtp_servers.perl | 4 ++-- installer/data/mysql/kohastructure.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_22343_smtp_servers.perl b/installer/data/mysql/atomicupdate/bug_22343_smtp_servers.perl index d1211ed541..58e747e5a1 100644 --- a/installer/data/mysql/atomicupdate/bug_22343_smtp_servers.perl +++ b/installer/data/mysql/atomicupdate/bug_22343_smtp_servers.perl @@ -30,8 +30,8 @@ if( CheckVersion( $DBversion ) ) { PRIMARY KEY (`id`), UNIQUE KEY `library_id_idx` (`library_id`), KEY `smtp_server_id_idx` (`smtp_server_id`), - CONSTRAINT `library_id_fk` FOREIGN KEY (`library_id`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `smtp_server_id_fk` FOREIGN KEY (`smtp_server_id`) REFERENCES `smtp_servers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `library_smtp_servers_library_fk` FOREIGN KEY (`library_id`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `library_smtp_servers_smtp_servers_fk` FOREIGN KEY (`smtp_server_id`) REFERENCES `smtp_servers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; }); } diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index a142dd1cd0..9920a8384c 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -4626,8 +4626,8 @@ CREATE TABLE `library_smtp_servers` ( PRIMARY KEY (`id`), UNIQUE KEY `library_id_idx` (`library_id`), KEY `smtp_server_id_idx` (`smtp_server_id`), - CONSTRAINT `library_id_fk` FOREIGN KEY (`library_id`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `smtp_server_id_fk` FOREIGN KEY (`smtp_server_id`) REFERENCES `smtp_servers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + CONSTRAINT `library_smtp_servers_library_fk` FOREIGN KEY (`library_id`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `library_smtp_servers_smtp_servers_fk` FOREIGN KEY (`smtp_server_id`) REFERENCES `smtp_servers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; -- 2.39.2