From c73c27e02d37712648d6f253aac42c2bb40c1621 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 11 Mar 2024 09:44:35 -0300 Subject: [PATCH] Bug 36232: Fix error in DBRev dealing with OAI-PMH:AutoUpdateSetsEmbedItemData typo This patch fixes the case of the wrong syspref variable co-existing with the good one. OAI-PMH:AutoUpdateSetsEmbedItemData is the only case, as the rest of the mispelled ones are just case fixes, which would not trigger the same situation as the `systempreferences` table collation is case-insentitive. To test: 1. Run: $ ktd --shell k$ koha-mysql kohadev > INSERT INTO systempreferences VALUES ('OAI-PMH:AutoUpdateSetEmbedItemData',0,'','','YesNo'); > UPDATE systempreferences SET variable = 'IllCheckAvailability' WHERE variable = "ILLCheckAvailability"; > INSERT INTO systempreferences VALUES ('IllCheckAvailability',0,'','','YesNo'); => FAIL: The last command fails because the good and wrong values cannot coexist 2. Set the version to a prior one: > UPDATE systempreferences SET value="23.1200004" WHERE variable like 'version'; 3. Run: k$ updatedatabase => FAIL: You get this error: ERROR: {UNKNOWN}: DBI Exception: DBD::mysql::db do failed: Duplicate entry 'OAI-PMH:AutoUpdateSetsEmbedItemData' for key 'systempreferences.PRIMARY' at ... 4. Apply this patch 5. Repeat 3 => SUCCESS: It works! 6. Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Victor Grousset/tuxayo Signed-off-by: David Nind Signed-off-by: Mohd Hafiz Yusoff Signed-off-by: Mohd Hafiz Yusoff Signed-off-by: Katrin Fischer --- installer/data/mysql/db_revs/231200005.pl | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/db_revs/231200005.pl b/installer/data/mysql/db_revs/231200005.pl index 58e3981346..c044287e58 100755 --- a/installer/data/mysql/db_revs/231200005.pl +++ b/installer/data/mysql/db_revs/231200005.pl @@ -80,13 +80,24 @@ return { my @misspelled; my $pref; + my $good_exists = $dbh->selectrow_array( + q{SELECT variable FROM systempreferences WHERE variable = 'OAI-PMH:AutoUpdateSetsEmbedItemData'}); + $pref = $dbh->selectrow_array( q{SELECT variable FROM systempreferences WHERE variable = 'OAI-PMH:AutoUpdateSetEmbedItemData'}); + if ( $pref eq "OAI-PMH:AutoUpdateSetEmbedItemData" ) { - $dbh->do( - q{UPDATE systempreferences SET variable = 'OAI-PMH:AutoUpdateSetsEmbedItemData' WHERE variable = "OAI-PMH:AutoUpdateSetEmbedItemData"} - ); - push @misspelled, "AutoUpdateSetsEmbedItemData"; + if ($good_exists) { + + # Already exists, just delete the bad one + $dbh->do(q{DELETE FROM systempreferences WHERE variable = "OAI-PMH:AutoUpdateSetEmbedItemData"}); + } else { + $dbh->do( + q{UPDATE systempreferences SET variable = 'OAI-PMH:AutoUpdateSetsEmbedItemData' WHERE variable = "OAI-PMH:AutoUpdateSetEmbedItemData"} + ); + } + + push @misspelled, "OAI-PMH:AutoUpdateSetsEmbedItemData"; } # Fix capitalization issues breaking unit tests -- 2.39.5