Bug 17913 - DBRev 16.12.00.005

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 27a8fcc..9c08593 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 = "16.12.00.004";
+$VERSION = "16.12.00.005";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_17913.perl b/installer/data/mysql/atomicupdate/bug_17913.perl
deleted file mode 100644 (file)
index 242f20b..0000000
--- a/installer/data/mysql/atomicupdate/bug_17913.perl
+++ /dev/null
@@ -1,7 +0,0 @@
-$DBversion = 'XXX';  # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-    $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES('AuthorityMergeMode','loose','loose|strict','Authority merge mode','Choice')");
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 17913 - AuthorityMergeMode)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 742c737..3472b7e 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -13838,6 +13838,14 @@ if ( CheckVersion($DBversion) ) {
     print "Upgrade to $DBversion done (Bug 17196 - Move marcxml out of the biblioitems table)\n";
 }
 
+$DBversion = '16.12.00.005';
+if( CheckVersion( $DBversion ) ) {
+    $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES('AuthorityMergeMode','loose','loose|strict','Authority merge mode','Choice')");
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 17913 - AuthorityMergeMode)\n";
+}
+
 # DEVELOPER PROCESS, search for anything to execute in the db_update directory
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.