From d2dc504ec1d87b74ea424d27462a214e7027385c Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Sat, 15 Jun 2019 07:58:29 +0100 Subject: [PATCH] Bug 9834: DBRev 19.06.00.005 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_9834.perl | 12 ------------ installer/data/mysql/updatedatabase.pl | 13 +++++++++++++ 3 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_9834.perl diff --git a/Koha.pm b/Koha.pm index 4ed50f68e2..1553fbdb0d 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.06.00.004"; +$VERSION = "19.06.00.005"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_9834.perl b/installer/data/mysql/atomicupdate/bug_9834.perl deleted file mode 100644 index 37189f562c..0000000000 --- a/installer/data/mysql/atomicupdate/bug_9834.perl +++ /dev/null @@ -1,12 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - unless ( column_exists( 'reserves', 'item_level_hold' ) ) { - $dbh->do( "ALTER TABLE reserves ADD COLUMN item_level_hold BOOLEAN NOT NULL DEFAULT 0 AFTER itemtype" ); - } - unless ( column_exists( 'old_reserves', 'item_level_hold' ) ) { - $dbh->do( "ALTER TABLE old_reserves ADD COLUMN item_level_hold BOOLEAN NOT NULL DEFAULT 0 AFTER itemtype" ); - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 9834 - Add the reserves.item_level_hold column)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8e1674c442..e22b1a3eb5 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -18728,6 +18728,19 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 22770 - Fix typo in language description for el in German)\n"; } +$DBversion = '19.06.00.005'; +if( CheckVersion( $DBversion ) ) { + unless ( column_exists( 'reserves', 'item_level_hold' ) ) { + $dbh->do( "ALTER TABLE reserves ADD COLUMN item_level_hold BOOLEAN NOT NULL DEFAULT 0 AFTER itemtype" ); + } + unless ( column_exists( 'old_reserves', 'item_level_hold' ) ) { + $dbh->do( "ALTER TABLE old_reserves ADD COLUMN item_level_hold BOOLEAN NOT NULL DEFAULT 0 AFTER itemtype" ); + } + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 9834 - Add the reserves.item_level_hold column)\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.20.1