Bug 21226: DBRev 18.06.00.015

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

diff --git a/Koha.pm b/Koha.pm
index 9446e4c..dec7c70 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.06.00.014";
+$VERSION = "18.06.00.015";
 
 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 (file)
index 19e0937..0000000
--- 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 53b3693..630500b 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -16246,6 +16246,15 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 21121 - New syspref to allow hiding of private patron data in circulation page)\n";
 }
 
+$DBversion = '18.06.00.015';
+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.