From 44e01fc3ca245ba2a3aefc408b9f155a66a5f289 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 26 Oct 2018 17:09:18 +0000 Subject: [PATCH] Bug 21639: DBRev 18.05.05.003 Signed-off-by: Nick Clemens (cherry picked from commit 22d817ddc863354b0a6316c6ddb91e2cc86cf603) Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../Bug_21639_add_phone_transports.perl | 13 ------------- installer/data/mysql/updatedatabase.pl | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/Bug_21639_add_phone_transports.perl diff --git a/Koha.pm b/Koha.pm index 6f1ac097cf..a79766a2e8 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.05.05.002"; +$VERSION = "18.05.05.003"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/Bug_21639_add_phone_transports.perl b/installer/data/mysql/atomicupdate/Bug_21639_add_phone_transports.perl deleted file mode 100644 index 1b5bf7d7ff..0000000000 --- a/installer/data/mysql/atomicupdate/Bug_21639_add_phone_transports.perl +++ /dev/null @@ -1,13 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q( - INSERT IGNORE INTO message_transports - (message_attribute_id,message_transport_type,is_digest,letter_module,letter_code) - VALUES - (2, 'phone', 0, 'circulation', 'PREDUE'), - (2, 'phone', 1, 'circulation', 'PREDUEDGST'), - (4, 'phone', 0, 'reserves', 'HOLD') - )); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 21639 - Add phone transports by default)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index cfe725b488..2c437eaedd 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16234,6 +16234,20 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 21617: Make statistics.ccode longer)\n"; } +$DBversion = '18.05.05.003'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q( + INSERT IGNORE INTO message_transports + (message_attribute_id,message_transport_type,is_digest,letter_module,letter_code) + VALUES + (2, 'phone', 0, 'circulation', 'PREDUE'), + (2, 'phone', 1, 'circulation', 'PREDUEDGST'), + (4, 'phone', 0, 'reserves', 'HOLD') + )); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21639 - Add phone transports by default)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1