From fe3817a8b7d631009b60f2d408bb4115ab96ec33 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 24 Mar 2020 11:12:51 +0000 Subject: [PATCH] Bug 21443: DBRev 19.12.00.052 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_21443.perl | 26 ------------------- installer/data/mysql/updatedatabase.pl | 25 ++++++++++++++++++ 3 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21443.perl diff --git a/Koha.pm b/Koha.pm index a30bb4ffb7..9ab2cc18ab 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.12.00.051"; +$VERSION = "19.12.00.052"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_21443.perl b/installer/data/mysql/atomicupdate/bug_21443.perl deleted file mode 100644 index 82329231c0..0000000000 --- a/installer/data/mysql/atomicupdate/bug_21443.perl +++ /dev/null @@ -1,26 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - if( !column_exists( 'itemtypes', 'rentalcharge_daily_calendar' ) ) { - $dbh->do(q{ - ALTER TABLE itemtypes ADD COLUMN - rentalcharge_daily_calendar tinyint(1) NOT NULL DEFAULT 1 - AFTER rentalcharge_daily; - }); - } - - if( !column_exists( 'itemtypes', 'rentalcharge_hourly_calendar' ) ) { - $dbh->do(q{ - ALTER TABLE itemtypes ADD COLUMN - rentalcharge_hourly_calendar tinyint(1) NOT NULL DEFAULT 1 - AFTER rentalcharge_hourly; - }); - } - - my $finesCalendar = C4::Context->preference('finesCalendar'); - my $value = $finesCalendar eq 'noFinesWhenClosed' ? 1 : 0; - $dbh->do("UPDATE itemtypes SET rentalcharge_hourly_calendar = $value, rentalcharge_daily_calendar = $value"); - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 21443: Add ability to exclude holidays when calculating rentals fees by time period)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index fa3f93703e..d247c1a020 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -21228,6 +21228,31 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 24759, "Cleanup OpacRenewalBranch"); } +$DBversion = '19.12.00.052'; +if( CheckVersion( $DBversion ) ) { + if( !column_exists( 'itemtypes', 'rentalcharge_daily_calendar' ) ) { + $dbh->do(q{ + ALTER TABLE itemtypes ADD COLUMN + rentalcharge_daily_calendar tinyint(1) NOT NULL DEFAULT 1 + AFTER rentalcharge_daily; + }); + } + + if( !column_exists( 'itemtypes', 'rentalcharge_hourly_calendar' ) ) { + $dbh->do(q{ + ALTER TABLE itemtypes ADD COLUMN + rentalcharge_hourly_calendar tinyint(1) NOT NULL DEFAULT 1 + AFTER rentalcharge_hourly; + }); + } + + my $finesCalendar = C4::Context->preference('finesCalendar'); + my $value = $finesCalendar eq 'noFinesWhenClosed' ? 1 : 0; + $dbh->do("UPDATE itemtypes SET rentalcharge_hourly_calendar = $value, rentalcharge_daily_calendar = $value"); + + NewVersion( $DBversion, 21443, "Add ability to exclude holidays when calculating rentals fees by time period"); +} + # 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.39.5