Bug 22607: DBRev 18.12.00.037

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 809b540..d907ad8 100644 (file)
--- 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.12.00.036";
+$VERSION = "18.12.00.037";
 
 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 (file)
index be7157f..0000000
--- 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 4f76b76..8dc7e04 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17853,6 +17853,20 @@ if ( CheckVersion($DBversion) ) {
     printf "Upgrade to $DBversion done (Bug 22518 - Fix accounttype 'O' to 'FU' - %d updated)\n", $rows;
 }
 
+$DBversion = '18.12.00.037';
+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.