From e001070ee588fa1152b0300641165d772380cd0e Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 24 Aug 2018 16:03:50 +0000 Subject: [PATCH] Bug 15524: DBRev 18.06.00.020 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_15524.perl | 18 ------------------ installer/data/mysql/updatedatabase.pl | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_15524.perl diff --git a/Koha.pm b/Koha.pm index 2f44de7f0c..5d9e6e202c 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.06.00.019"; +$VERSION = "18.06.00.020"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_15524.perl b/installer/data/mysql/atomicupdate/bug_15524.perl deleted file mode 100644 index 4e23d9113c..0000000000 --- a/installer/data/mysql/atomicupdate/bug_15524.perl +++ /dev/null @@ -1,18 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - if( !column_exists( 'branch_borrower_circ_rules', 'max_holds' ) ) { - $dbh->do(q{ - ALTER TABLE branch_borrower_circ_rules ADD COLUMN max_holds INT(4) NULL DEFAULT NULL AFTER maxonsiteissueqty - }); - } - - if( !column_exists( 'default_borrower_circ_rules', 'max_holds' ) ) { - $dbh->do(q{ - ALTER TABLE default_borrower_circ_rules ADD COLUMN max_holds INT(4) NULL DEFAULT NULL AFTER maxonsiteissueqty - }); - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 15524 - Set limit on maximum possible holds per patron by category)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7385875f9d..4fac0247b1 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16295,6 +16295,22 @@ INSERT IGNORE INTO columns_settings (module, page, tablename, columnname, cannot print "Upgrade to $DBversion done (Bug 19719: Default to hiding collection code column)\n"; } +$DBversion = '18.06.00.020'; +if( CheckVersion( $DBversion ) ) { + if( !column_exists( 'branch_borrower_circ_rules', 'max_holds' ) ) { + $dbh->do(q{ + ALTER TABLE branch_borrower_circ_rules ADD COLUMN max_holds INT(4) NULL DEFAULT NULL AFTER maxonsiteissueqty + }); + } + if( !column_exists( 'default_borrower_circ_rules', 'max_holds' ) ) { + $dbh->do(q{ + ALTER TABLE default_borrower_circ_rules ADD COLUMN max_holds INT(4) NULL DEFAULT NULL AFTER maxonsiteissueqty + }); + } + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 15524 - Set limit on maximum possible holds per patron by category)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.2