From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 16 Jul 2020 14:16:41 +0000 (+0100)
Subject: Bug 25851: DBRev 20.06.00.004
X-Git-Url: http://git.equinoxoli.org/?p=koha-equinox.git;a=commitdiff_plain;h=4b0c2e56e43ddacbd3983a8669026b95cd08d660

Bug 25851: DBRev 20.06.00.004

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---

diff --git a/Koha.pm b/Koha.pm
index d12a020..b4d9bd2 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 a0aeec0..0000000
--- 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 8b6f3e9..58708f1 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/';