From c7938f5f86ca4d54e230af415ecae87eda38a324 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 4 Nov 2020 11:53:04 +0000 Subject: [PATCH] Bug 26638: DBRev 20.06.00.057 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- ...638_ArticleRequestsMandatoryFieldsItemsOnly.perl | 11 ----------- installer/data/mysql/updatedatabase.pl | 13 +++++++++++++ 3 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_26638_ArticleRequestsMandatoryFieldsItemsOnly.perl diff --git a/Koha.pm b/Koha.pm index 24e19d727c..c667949c8e 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.056"; +$VERSION = "20.06.00.057"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_26638_ArticleRequestsMandatoryFieldsItemsOnly.perl b/installer/data/mysql/atomicupdate/bug_26638_ArticleRequestsMandatoryFieldsItemsOnly.perl deleted file mode 100644 index d95cf12e30..0000000000 --- a/installer/data/mysql/atomicupdate/bug_26638_ArticleRequestsMandatoryFieldsItemsOnly.perl +++ /dev/null @@ -1,11 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES - ('ArticleRequestsMandatoryFieldsItemOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple') - }); - $dbh->do(q{ - DELETE FROM systempreferences WHERE variable = "ArticleRequestsMandatoryFieldsItemsOnly" - }); - NewVersion( $DBversion, 26638, "Add missing system preference ArticleRequestsMandatoryFieldsItemOnly"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f31a1c8fba..db0746bdc6 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -23161,6 +23161,19 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 26853, "Update import_biblios columns and indexes" ); } +$DBversion = '20.06.00.057'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES + ('ArticleRequestsMandatoryFieldsItemOnly', '', NULL, 'Comma delimited list of required fields for bibs where article requests rule = ''item_only''', 'multiple') + }); + $dbh->do(q{ + DELETE FROM systempreferences WHERE variable = "ArticleRequestsMandatoryFieldsItemsOnly" + }); + + NewVersion( $DBversion, 26638, "Add missing system preference ArticleRequestsMandatoryFieldsItemOnly"); +} + # 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.39.5