From 905553f304538758cb5511b4796b9fc5b8a57af0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 25 Jun 2020 10:51:35 +0200 Subject: [PATCH] Bug 25232: DBRev 20.06.00.002 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_25232.perl | 11 ----------- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_25232.perl diff --git a/Koha.pm b/Koha.pm index bb067e7979..db1c707fb3 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "20.06.00.001"; +$VERSION = "20.06.00.002"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_25232.perl b/installer/data/mysql/atomicupdate/bug_25232.perl deleted file mode 100644 index 2d3318591b..0000000000 --- a/installer/data/mysql/atomicupdate/bug_25232.perl +++ /dev/null @@ -1,11 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - # $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" ); - $dbh->do(q{ - INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('SkipHoldTrapOnNotForLoanValue','',NULL,'If set, Koha will never trap items for hold with this notforloan value','Integer') - }); - - # Always end with this (adjust the bug info) - NewVersion( $DBversion, 25184, "Items with a negative notforloan status should not be captured for holds"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 57518f45fc..139042b652 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22200,6 +22200,16 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 24986, "Switch borrowers address related fields to TINYTEXT or MEDIUMTEXT"); } +$DBversion = '20.06.00.002'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES + ('SkipHoldTrapOnNotForLoanValue','',NULL,'If set, Koha will never trap items for hold with this notforloan value','Integer') + }); + + NewVersion( $DBversion, 25184, "Items with a negative notforloan status should not be captured for holds"); +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.20.1