From 4b0c2e56e43ddacbd3983a8669026b95cd08d660 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 16 Jul 2020 15:16:41 +0100 Subject: [PATCH] Bug 25851: DBRev 20.06.00.004 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_25851.perl | 7 ------- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_25851.perl diff --git a/Koha.pm b/Koha.pm index d12a020045..b4d9bd25a7 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.003"; +$VERSION = "20.06.00.004"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_25851.perl b/installer/data/mysql/atomicupdate/bug_25851.perl deleted file mode 100644 index a0aeec0814..0000000000 --- a/installer/data/mysql/atomicupdate/bug_25851.perl +++ /dev/null @@ -1,7 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(" - DELETE FROM circulation_rules WHERE rule_name='holdallowed' AND rule_value=''; - "); - NewVersion( $DBversion, 25851, "Remove holdallowed rule if value is an empty string"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8b6f3e9a7e..58708f18d5 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22227,6 +22227,14 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 24156, "Add new table tables_settings" ); } +$DBversion = '20.06.00.004'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(" + DELETE FROM circulation_rules WHERE rule_name='holdallowed' AND rule_value=''; + "); + NewVersion( $DBversion, 25851, "Remove holdallowed rule if value is an empty string"); +} + # 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