From 07626b3b6e12c62496e8b8e82c7077949c37a1b0 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 20 Jan 2017 13:58:52 +0000 Subject: [PATCH] Bug 17913 - DBRev 16.12.00.005 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_17913.perl | 7 ------- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_17913.perl diff --git a/Koha.pm b/Koha.pm index 27a8fcc6bc..9c085931aa 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 = "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 index 242f20b69c..0000000000 --- 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 742c737764..3472b7e848 100755 --- 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. -- 2.39.5