From 7619c90e0670c2f5dd10d3c0c03a8d3b38ff4f85 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Sat, 23 Mar 2019 08:51:15 +0000 Subject: [PATCH] Bug 22607: DBRev 18.11.04.001 Signed-off-by: Nick Clemens (cherry picked from commit ced69febf3de17691d885e9ee7e03ef46c28b2ae) Signed-off-by: Martin Renvoize --- 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 f3170a291a..8c66463583 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.11.04.000"; +$VERSION = "18.11.04.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 50e421c556..e8793f9987 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17350,6 +17350,20 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = '18.11.04.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.39.5