From 3017d592a10da23fc12e6a94ba70d7ff9e7d7d94 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 7 Sep 2018 15:53:24 +0000 Subject: [PATCH] Bug 21235: DBRev 18.05.04.001 Signed-off-by: Nick Clemens (cherry picked from commit c66a2894e1857b403a52d8392d46c343be7d0ed8) Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_21235.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 7 +++++++ 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21235.perl diff --git a/Koha.pm b/Koha.pm index 1382c55b13..8c89782189 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.03.000"; +$VERSION = "18.05.03.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_21235.perl b/installer/data/mysql/atomicupdate/bug_21235.perl deleted file mode 100644 index e7858cd647..0000000000 --- a/installer/data/mysql/atomicupdate/bug_21235.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "DROP TABLE IF EXISTS services_throttle" ); - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 21235: Remove table services_throttle)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8cd8f1c094..95835cfc38 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16148,6 +16148,13 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (18.05.03 release)\n"; } +$DBversion = '18.05.03.001'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "DROP TABLE IF EXISTS services_throttle" ); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21235: Remove table services_throttle)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5