From edf50215b5e2282568f12f4d1e33dd8e56a467c8 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 8 Nov 2018 21:05:49 +0000 Subject: [PATCH] Bug 19349: DBRev 18.06.00.058 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_19349.perl | 13 ------------- installer/data/mysql/updatedatabase.pl | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_19349.perl diff --git a/Koha.pm b/Koha.pm index 720fb94742..10ac642484 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 = "18.06.00.057"; +$VERSION = "18.06.00.058"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_19349.perl b/installer/data/mysql/atomicupdate/bug_19349.perl deleted file mode 100644 index 3412d1dedb..0000000000 --- a/installer/data/mysql/atomicupdate/bug_19349.perl +++ /dev/null @@ -1,13 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`, `type`) VALUES - ('MarcFieldForCreatorId','',NULL,'Where to store the borrowernumber of the record''s creator','Free'), - ('MarcFieldForCreatorName','',NULL,'Where to store the name of the record''s creator','Free'), - ('MarcFieldForModifierId','',NULL,'Where to store the borrowernumber of the record''s last modifier','Free'), - ('MarcFieldForModifierName','',NULL,'Where to store the name of the record''s last modifier','Free') - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 19349 - Add system preferences MarcFieldForCreatorId, MarcFieldForCreatorName, MarcFieldForModifierId, MarcFieldForModifierName)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 26b8f7e863..c87fac3138 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17045,6 +17045,20 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 20312 - Add showLastPatron systempreference)\n"; } +$DBversion = '18.06.00.058'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`, `type`) VALUES + ('MarcFieldForCreatorId','',NULL,'Where to store the borrowernumber of the record''s creator','Free'), + ('MarcFieldForCreatorName','',NULL,'Where to store the name of the record''s creator','Free'), + ('MarcFieldForModifierId','',NULL,'Where to store the borrowernumber of the record''s last modifier','Free'), + ('MarcFieldForModifierName','',NULL,'Where to store the name of the record''s last modifier','Free') + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 19349 - Add system preferences MarcFieldForCreatorId, MarcFieldForCreatorName, MarcFieldForModifierId, MarcFieldForModifierName)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5