From 1ac1067b64edfb8d250d61b5242bdefbe241cf83 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 22 Apr 2021 09:09:13 +0000 Subject: [PATCH] Bug 16787: DBRev 20.12.00.036 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- ...6787_add_noReservesAllowed_to_club_holds.perl | 16 ---------------- installer/data/mysql/updatedatabase.pl | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_16787_add_noReservesAllowed_to_club_holds.perl diff --git a/Koha.pm b/Koha.pm index 023a7b3cdb..cff5fd5fcf 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.12.00.035"; +$VERSION = "20.12.00.036"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_16787_add_noReservesAllowed_to_club_holds.perl b/installer/data/mysql/atomicupdate/bug_16787_add_noReservesAllowed_to_club_holds.perl deleted file mode 100644 index 7cd3fc669a..0000000000 --- a/installer/data/mysql/atomicupdate/bug_16787_add_noReservesAllowed_to_club_holds.perl +++ /dev/null @@ -1,16 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - ALTER TABLE club_holds_to_patron_holds - MODIFY COLUMN error_code - ENUM ( 'damaged', 'ageRestricted', 'itemAlreadyOnHold', - 'tooManyHoldsForThisRecord', 'tooManyReservesToday', - 'tooManyReserves', 'notReservable', 'cannotReserveFromOtherBranches', - 'libraryNotFound', 'libraryNotPickupLocation', 'cannotBeTransferred', - 'noReservesAllowed' - ) - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 16787: Add noReservesAllowed to club holds error codes)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d7dbbc07fa..a6671df0aa 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -23874,6 +23874,22 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 23207, "Add automatic_checkin to itemtypes table"); } +$DBversion = '20.12.00.036'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + ALTER TABLE club_holds_to_patron_holds + MODIFY COLUMN error_code + ENUM ( 'damaged', 'ageRestricted', 'itemAlreadyOnHold', + 'tooManyHoldsForThisRecord', 'tooManyReservesToday', + 'tooManyReserves', 'notReservable', 'cannotReserveFromOtherBranches', + 'libraryNotFound', 'libraryNotPickupLocation', 'cannotBeTransferred', + 'noReservesAllowed' + ) + }); + + NewVersion( $DBversion, 16787, "Add noReservesAllowed to club holds error codes"); +} + # 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/';