From aab956af68d0bc72c6268866cc8b5083dc6dee43 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 7 Nov 2019 09:14:48 +0000 Subject: [PATCH] Bug 13958: DBRev 19.06.00.049 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_13958.perl | 18 ------------------ installer/data/mysql/updatedatabase.pl | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_13958.perl diff --git a/Koha.pm b/Koha.pm index fda439312b..2cac55336c 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 = "19.06.00.048"; +$VERSION = "19.06.00.049"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_13958.perl b/installer/data/mysql/atomicupdate/bug_13958.perl deleted file mode 100644 index 3c3abec8cd..0000000000 --- a/installer/data/mysql/atomicupdate/bug_13958.perl +++ /dev/null @@ -1,18 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - - $dbh->do(q{ - INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) - SELECT - 'SuspensionsCalendar', - IF( value='noFinesWhenClosed', 'noSuspensionsWhenClosed', 'ignoreCalendar'), - 'ignoreCalendar|noSuspensionsWhenClosed', - 'Specify whether to use the Calendar in calculating suspensions', - 'Choice' - FROM systempreferences - WHERE variable='finesCalendar'; - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 13958 - Add a SuspensionsCalendar syspref)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 79d73f9fca..c1726a66a5 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20174,6 +20174,25 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 22581 - add new OPACShowMusicalInscripts and OPACPlayMusicalInscripts system preferences)\n"; } +$DBversion = '19.06.00.049'; +if( CheckVersion( $DBversion ) ) { + + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) + SELECT + 'SuspensionsCalendar', + IF( value='noFinesWhenClosed', 'noSuspensionsWhenClosed', 'ignoreCalendar'), + 'ignoreCalendar|noSuspensionsWhenClosed', + 'Specify whether to use the Calendar in calculating suspensions', + 'Choice' + FROM systempreferences + WHERE variable='finesCalendar'; + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 13958 - Add a SuspensionsCalendar syspref)\n"; +} + # 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/'; -- 2.20.1