Bug 20244: DBRev 18.06.00.061

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 46ba922..9cd9e47 100644 (file)
--- 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 = "18.06.00.060";
+$VERSION = "18.06.00.061";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_19893_elasticsearch_index_status_sysprefs.perl b/installer/data/mysql/atomicupdate/bug_19893_elasticsearch_index_status_sysprefs.perl
deleted file mode 100644 (file)
index ed95da0..0000000
--- a/installer/data/mysql/atomicupdate/bug_19893_elasticsearch_index_status_sysprefs.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`,`explanation`,`options`,`type`) VALUES
-        ('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL),
-        ('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL)
-    });
-
-    SetVersion($DBversion);
-    print "Upgrade to $DBversion done (Bug 19893 - Add elasticsearch index status preferences)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 2ec956e..a97b92a 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17111,6 +17111,17 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 15836 - Add class_sort_rules.split_routine and split_regex)\n";
 }
 
+$DBversion = '18.06.00.061';
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        INSERT IGNORE INTO `systempreferences` (`variable`,`value`,`explanation`,`options`,`type`) VALUES
+        ('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL),
+        ('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL)
+    });
+    SetVersion($DBversion);
+    print "Upgrade to $DBversion done (Bug 19893 - Add elasticsearch index status preferences)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.