From f04e77c7e5411ca7dcf761e7e1177d7362a10654 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 20 Mar 2020 16:02:15 +0000 Subject: [PATCH] Bug 24436: DBRev 19.12.00.049 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_24436.perl | 27 ------------------ installer/data/mysql/updatedatabase.pl | 28 +++++++++++++++++++ 3 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24436.perl diff --git a/Koha.pm b/Koha.pm index 869540476f..da630409f6 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.048"; +$VERSION = "19.12.00.049"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24436.perl b/installer/data/mysql/atomicupdate/bug_24436.perl deleted file mode 100644 index a23ce9ebad..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24436.perl +++ /dev/null @@ -1,27 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - # Add reserve reasons enum - $dbh->do( - qq{ - ALTER TABLE - `branchtransfers` - MODIFY COLUMN - `reason` enum( - 'Manual', - 'StockrotationAdvance', - 'StockrotationRepatriation', - 'ReturnToHome', - 'ReturnToHolding', - 'RotatingCollection', - 'Reserve', - 'LostReserve', - 'CancelReserve' - ) - AFTER `comments` - } - ); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 24299 - Add 'reserve' reasons to branchtransfers enum)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 10f8ec0a1c..5991f9927d 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -21228,6 +21228,34 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 24299 - Add 'collection' reasons to branchtransfers enum)\n"; } +$DBversion = '19.12.00.049'; +if( CheckVersion( $DBversion ) ) { + + # Add reserve reasons enum + $dbh->do( + qq{ + ALTER TABLE + `branchtransfers` + MODIFY COLUMN + `reason` enum( + 'Manual', + 'StockrotationAdvance', + 'StockrotationRepatriation', + 'ReturnToHome', + 'ReturnToHolding', + 'RotatingCollection', + 'Reserve', + 'LostReserve', + 'CancelReserve' + ) + AFTER `comments` + } + ); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 24299 - Add 'reserve' reasons to branchtransfers enum)\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.39.5