From 7b094874ec08ed32568a7e0b94464bebc7f082ab Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 16 Aug 2018 14:03:28 +0000 Subject: [PATCH] Bug 21226: DBRev 18.05.02.002 Signed-off-by: Nick Clemens (cherry picked from commit 610c628def96437c0cc75ec2d2455cd373c5db18) Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_21226.sql | 3 --- installer/data/mysql/updatedatabase.pl | 9 +++++++++ 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21226.sql diff --git a/Koha.pm b/Koha.pm index e620372509..7fbcfcd7d2 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.02.001"; +$VERSION = "18.05.02.002"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_21226.sql b/installer/data/mysql/atomicupdate/bug_21226.sql deleted file mode 100644 index 19e0937b29..0000000000 --- a/installer/data/mysql/atomicupdate/bug_21226.sql +++ /dev/null @@ -1,3 +0,0 @@ -DELETE FROM systempreferences where variable="OCLCAffiliateID"; -DELETE FROM systempreferences where variable="XISBN"; -DELETE FROM systempreferences where variable="XISBNDailyLimit"; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 79c850d297..4aebfc3395 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16105,6 +16105,15 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 20980 - Manual credit offsets are stored as debits)\n"; } +$DBversion = '18.05.02.002'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{DELETE FROM systempreferences where variable="OCLCAffiliateID";}); + $dbh->do(q{DELETE FROM systempreferences where variable="XISBN";}); + $dbh->do(q{DELETE FROM systempreferences where variable="XISBNDailyLimit";}); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21226 - Remove prefs OCLCAffiliateID, XISBN and XISBNDailyLimit)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.2