From 11ec72e18fa83543d1db97dd268468dc62278d93 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 30 Aug 2023 16:21:37 +0200 Subject: [PATCH] Bug 34276: (bug 21983 follow-up) Fix db rev 23.06.00.002 Content-Type: text/plain; charset=utf-8 Signed-off-by: Pedro Amorim Signed-off-by: Marcel de Rooy --- installer/data/mysql/db_revs/221200026.pl | 2 +- installer/data/mysql/db_revs/230600002.pl | 26 +++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/db_revs/221200026.pl b/installer/data/mysql/db_revs/221200026.pl index fb8ccc9e6e..5726f50970 100755 --- a/installer/data/mysql/db_revs/221200026.pl +++ b/installer/data/mysql/db_revs/221200026.pl @@ -31,7 +31,7 @@ return { $dbh->do(q{ ALTER TABLE illrequests ADD KEY `illrequests_bibfk` (`biblio_id`), - ADD FOREIGN KEY illrequests_bibfk (`biblio_id`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE; + ADD CONSTRAINT illrequests_bibfk FOREIGN KEY (`biblio_id`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE; }); say $out "Added foreign key constraint 'illrequests.illrequests_bibfk'"; diff --git a/installer/data/mysql/db_revs/230600002.pl b/installer/data/mysql/db_revs/230600002.pl index 2453185c68..21804ee49d 100755 --- a/installer/data/mysql/db_revs/230600002.pl +++ b/installer/data/mysql/db_revs/230600002.pl @@ -27,11 +27,33 @@ return { AND illrequests.biblio_id IS NOT NULL }); - unless ( foreign_key_exists( 'illrequests', 'illrequests_bibfk' ) ) { + if ( foreign_key_exists( 'illrequests', 'illrequests_ibfk_1' ) ) { + $dbh->do(q{ + ALTER TABLE illrequests + DROP FOREIGN KEY illrequests_ibfk_1 + }); + } + + if ( !foreign_key_exists( 'illrequests', 'illrequests_bibfk' ) + || !index_exists('illrequests', 'illrequests_bibfk') ) { + + if ( foreign_key_exists( 'illrequests', 'illrequests_bibfk' ) ) { + $dbh->do(q{ + ALTER TABLE illrequests + DROP FOREIGN KEY illrequests_bibfk + }); + } + if (index_exists('illrequests', 'illrequests_bibfk')) { + $dbh->do(q{ + ALTER TABLE illrequests + DROP INDEX illrequests_bibfk + }); + } + $dbh->do(q{ ALTER TABLE illrequests ADD KEY `illrequests_bibfk` (`biblio_id`), - ADD FOREIGN KEY illrequests_bibfk (`biblio_id`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE; + ADD CONSTRAINT illrequests_bibfk FOREIGN KEY (`biblio_id`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE; }); say $out "Added foreign key constraint 'illrequests.illrequests_bibfk'"; -- 2.30.2