From bcc160ebb659d5fdb70cef5322b44f41c5eff5d9 Mon Sep 17 00:00:00 2001 From: Emily Lamancusa Date: Wed, 11 Oct 2023 09:40:05 -0400 Subject: [PATCH] Bug 34881: Improve idempotency of DBRev Signed-off-by: David Nind Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d9463f82c4344b93e4b5d0aea64339bb6c3d492a) Signed-off-by: Fridolin Somers --- installer/data/mysql/db_revs/220600015.pl | 46 +++++++++++++++++------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/installer/data/mysql/db_revs/220600015.pl b/installer/data/mysql/db_revs/220600015.pl index 89dc2d628b..9b12ba6204 100755 --- a/installer/data/mysql/db_revs/220600015.pl +++ b/installer/data/mysql/db_revs/220600015.pl @@ -22,21 +22,43 @@ return { say $out "Added new table 'item_bundles'"; - my ($lost_val) = $dbh->selectrow_array( "SELECT MAX(CAST(authorised_value AS SIGNED)) FROM authorised_values WHERE category = 'LOST'", {} ); - $lost_val++; + my ($lost_val) = $dbh->selectrow_array( + "SELECT CAST(authorised_value AS SIGNED) FROM authorised_values WHERE category = 'LOST' AND lib = 'Missing from bundle' LIMIT 1", + {} + ); - $dbh->do(qq{ - INSERT INTO authorised_values (category,authorised_value,lib) VALUES ('LOST',$lost_val,'Missing from bundle') - }); - say $out "Missing from bundle LOST AV added"; + if ( !$lost_val ) { - my ($nfl_val) = $dbh->selectrow_array( "SELECT MAX(CAST(authorised_value AS SIGNED)) FROM authorised_values WHERE category = 'NOT_LOAN'", {} ); - $nfl_val++; + ($lost_val) = $dbh->selectrow_array( + "SELECT MAX(CAST(authorised_value AS SIGNED)) FROM authorised_values WHERE category = 'LOST'", {} ); + $lost_val++; - $dbh->do(qq{ - INSERT INTO authorised_values (category,authorised_value,lib) VALUES ('NOT_LOAN',$nfl_val,'Added to bundle') - }); - say $out "Added to bundle NOT_LOAN AV added"; + $dbh->do( + qq{) + INSERT INTO authorised_values (category,authorised_value,lib) VALUES ('LOST',$lost_val,'Missing from bundle') + } + ); + say $out "Missing from bundle LOST AV added"; + } + + my ($nfl_val) = $dbh->selectrow_array( + "SELECT CAST(authorised_value AS SIGNED) FROM authorised_values WHERE category = 'NOT_LOAN' AND lib = 'Added to bundle' LIMIT 1", + {} + ); + + if ( !$nfl_val ) { + + ($nfl_val) = $dbh->selectrow_array( + "SELECT MAX(CAST(authorised_value AS SIGNED)) FROM authorised_values WHERE category = 'NOT_LOAN'", {} ); + $nfl_val++; + + $dbh->do( + qq{ + INSERT INTO authorised_values (category,authorised_value,lib) VALUES ('NOT_LOAN',$nfl_val,'Added to bundle') + } + ); + say $out "Added to bundle NOT_LOAN AV added"; + } $dbh->do(qq{ INSERT IGNORE INTO systempreferences( `variable`, `value`, `options`, `explanation`, `type` ) -- 2.39.5