From 8ffc1ba00cf21377f1ea476026a5df7a711adaae Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Tue, 23 Apr 2019 12:37:54 +0000 Subject: [PATCH] Bug 22607: DBRev 18.05.11.001 Signed-off-by: Lucas Gass --- Koha.pm | 2 +- ...g22607_set_issues_renewals_default_to_zero.perl | 13 ------------- installer/data/mysql/updatedatabase.pl | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/Bug22607_set_issues_renewals_default_to_zero.perl diff --git a/Koha.pm b/Koha.pm index a6c52b6f1c..14cc8d2539 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.05.11.000"; +$VERSION = "18.05.11.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/Bug22607_set_issues_renewals_default_to_zero.perl b/installer/data/mysql/atomicupdate/Bug22607_set_issues_renewals_default_to_zero.perl deleted file mode 100644 index be7157fff6..0000000000 --- a/installer/data/mysql/atomicupdate/Bug22607_set_issues_renewals_default_to_zero.perl +++ /dev/null @@ -1,13 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - $dbh->do( "UPDATE issues SET renewals = 0 WHERE renewals IS NULL" ); - $dbh->do( "UPDATE old_issues SET renewals = 0 WHERE renewals IS NULL" ); - - $dbh->do( "ALTER TABLE issues MODIFY COLUMN renewals tinyint(4) NOT NULL default 0"); - $dbh->do( "ALTER TABLE old_issues MODIFY COLUMN renewals tinyint(4) NOT NULL default 0"); - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug XXXXX - Set default value of issues.renewals to 0)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e973bbe20c..914392a72a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16342,6 +16342,20 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = '18.05.11.001'; +if( CheckVersion( $DBversion ) ) { + + $dbh->do( "UPDATE issues SET renewals = 0 WHERE renewals IS NULL" ); + $dbh->do( "UPDATE old_issues SET renewals = 0 WHERE renewals IS NULL" ); + + $dbh->do( "ALTER TABLE issues MODIFY COLUMN renewals tinyint(4) NOT NULL default 0"); + $dbh->do( "ALTER TABLE old_issues MODIFY COLUMN renewals tinyint(4) NOT NULL default 0"); + + # Always end with this (adjust the bug info) + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22607 - Set default value of issues.renewals to 0)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1