Bug 14642 - DBRev 16.06.00.015

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index e5dae38..70158d1 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 = "16.06.00.014";
+$VERSION = "16.06.00.015";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_14642_holds_logging.sql b/installer/data/mysql/atomicupdate/bug_14642_holds_logging.sql
deleted file mode 100644 (file)
index 85a08eb..0000000
--- a/installer/data/mysql/atomicupdate/bug_14642_holds_logging.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) VALUES
-('HoldsLog','0',NULL,'If ON, log create/cancel/suspend/resume actions on holds.','YesNo');
-
--- $DBversion = "16.06.00.XXX";
--- if ( CheckVersion($DBversion) ) {
---     $dbh->do(q{
---         INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) VALUES
---         ('HoldsLog','0',NULL,'If ON, log create/cancel/suspend/resume actions on holds.','YesNo');
---     });
-
---     print "Upgrade to $DBversion done (Bug 14642: Add logging of hold modifications)\n";
---     SetVersion($DBversion);
--- }

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index e526b22..6697919 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -12821,6 +12821,17 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "16.06.00.015";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) VALUES
+        ('HoldsLog','0',NULL,'If ON, log create/cancel/suspend/resume actions on holds.','YesNo');
+    });
+
+    print "Upgrade to $DBversion done (Bug 14642: Add logging of hold modifications)\n";
+    SetVersion($DBversion);
+}
+
 # DEVELOPER PROCESS, search for anything to execute in the db_update directory
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.