From 2c91f7ded5d775df7613950a1006c701882841af Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 15 Jun 2021 14:41:01 +0000 Subject: [PATCH] Bug 24434: DBRev 21.05.01.002 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_24434.perl | 28 ------------------ installer/data/mysql/updatedatabase.pl | 29 +++++++++++++++++++ 3 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24434.perl diff --git a/Koha.pm b/Koha.pm index 522f5122b4..fd2ecd4b75 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 = "21.05.01.001"; +$VERSION = "21.05.01.002"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24434.perl b/installer/data/mysql/atomicupdate/bug_24434.perl deleted file mode 100644 index 8c99664ef5..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24434.perl +++ /dev/null @@ -1,28 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - # Add 'WrongTransfer' to branchtransfers cancellation_reason enum - $dbh->do( - q{ - ALTER TABLE - `branchtransfers` - MODIFY COLUMN - `cancellation_reason` enum( - 'Manual', - 'StockrotationAdvance', - 'StockrotationRepatriation', - 'ReturnToHome', - 'ReturnToHolding', - 'RotatingCollection', - 'Reserve', - 'LostReserve', - 'CancelReserve', - 'ItemLost', - 'WrongTransfer' - ) - AFTER `comments` - } - ); - - NewVersion( $DBversion, 24434, "Add 'WrongTransfer' to branchtransfers.cancellation_reason enum"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 949cb0d34f..f4bde633fd 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -24314,6 +24314,35 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 28490, "Bring back accidentally deleted relationship columns"); } +$DBversion = '21.05.01.002'; +if( CheckVersion( $DBversion ) ) { + + # Add 'WrongTransfer' to branchtransfers cancellation_reason enum + $dbh->do( + q{ + ALTER TABLE + `branchtransfers` + MODIFY COLUMN + `cancellation_reason` enum( + 'Manual', + 'StockrotationAdvance', + 'StockrotationRepatriation', + 'ReturnToHome', + 'ReturnToHolding', + 'RotatingCollection', + 'Reserve', + 'LostReserve', + 'CancelReserve', + 'ItemLost', + 'WrongTransfer' + ) + AFTER `comments` + } + ); + + NewVersion( $DBversion, 24434, "Add 'WrongTransfer' to branchtransfers.cancellation_reason enum"); +} + # 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