From 6dd1dbc3a117e8aa4a320b4d3c87458b4e74333d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 5 Nov 2020 11:07:01 +0000 Subject: [PATCH] Bug 25334: DBRev 20.06.00.060 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_25334.perl | 27 ------------------- installer/data/mysql/updatedatabase.pl | 27 +++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_25334.perl diff --git a/Koha.pm b/Koha.pm index b1af032b21..f70e9612d5 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 = "20.06.00.059"; +$VERSION = "20.06.00.060"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_25334.perl b/installer/data/mysql/atomicupdate/bug_25334.perl deleted file mode 100644 index c205a96a1b..0000000000 --- a/installer/data/mysql/atomicupdate/bug_25334.perl +++ /dev/null @@ -1,27 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('PhoneNotification','0',NULL,'If ON, enables generation of phone notifications to be sent by plugins','YesNo') - }); - - $dbh->do(q{ - INSERT INTO message_transport_types (message_transport_type) VALUES ('phone') - }); - - $dbh->do(q{ - INSERT IGNORE INTO `message_transports` - (`message_attribute_id`, `message_transport_type`, `is_digest`, `letter_module`, `letter_code`) - VALUES - (1, 'phone', 0, 'circulation', 'DUE'), - (1, 'phone', 1, 'circulation', 'DUEDGST'), - (2, 'phone', 0, 'circulation', 'PREDUE'), - (2, 'phone', 1, 'circulation', 'PREDUEDGST'), - (4, 'phone', 0, 'reserves', 'HOLD'), - (5, 'phone', 0, 'circulation', 'CHECKIN'), - (6, 'phone', 0, 'circulation', 'CHECKOUT'); - }); - - # Always end with this (adjust the bug info) - NewVersion( $DBversion, 25334, "Add generic 'phone' message transport type"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index dec8ffa48d..bb5c9a8849 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -23208,6 +23208,33 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 19482, "Add mandatory column to search_field for ES mapping" ); } +$DBversion = '20.06.00.060'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES + ('PhoneNotification','0',NULL,'If ON, enables generation of phone notifications to be sent by plugins','YesNo') + }); + + $dbh->do(q{ + INSERT IGNORE INTO message_transport_types (message_transport_type) VALUES ('phone') + }); + + $dbh->do(q{ + INSERT IGNORE INTO `message_transports` + (`message_attribute_id`, `message_transport_type`, `is_digest`, `letter_module`, `letter_code`) + VALUES + (1, 'phone', 0, 'circulation', 'DUE'), + (1, 'phone', 1, 'circulation', 'DUEDGST'), + (2, 'phone', 0, 'circulation', 'PREDUE'), + (2, 'phone', 1, 'circulation', 'PREDUEDGST'), + (4, 'phone', 0, 'reserves', 'HOLD'), + (5, 'phone', 0, 'circulation', 'CHECKIN'), + (6, 'phone', 0, 'circulation', 'CHECKOUT'); + }); + + NewVersion( $DBversion, 25334, "Add generic 'phone' message transport type"); +} + # 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