Bug 15498 - DBRev 16.12.00.018

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

diff --git a/Koha.pm b/Koha.pm
index cf268ab..361d1f0 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.12.00.017";
+$VERSION = "16.12.00.018";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_15475.sql b/installer/data/mysql/atomicupdate/bug_15475.sql
deleted file mode 100644 (file)
index 9c34eef..0000000
--- a/installer/data/mysql/atomicupdate/bug_15475.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type )
-    SELECT 'ExportCircHistory', COUNT(*), NULL, "Display the export circulation options",  'YesNo'
-    FROM systempreferences
-    WHERE ( variable = 'ExportRemoveFields' AND value != "" AND value IS NOT NULL )
-        OR ( variable = 'ExportWithCsvProfile' AND value != "" AND value IS NOT NULL );
-DELETE FROM systempreferences WHERE variable="ExportWithCsvProfile";

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 63974ca..9f283a1 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -14016,6 +14016,24 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "16.12.00.018";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type )
+            SELECT 'ExportCircHistory', COUNT(*), NULL, "Display the export circulation options",  'YesNo'
+            FROM systempreferences
+            WHERE ( variable = 'ExportRemoveFields' AND value != "" AND value IS NOT NULL )
+                OR ( variable = 'ExportWithCsvProfile' AND value != "" AND value IS NOT NULL );
+    });
+
+    $dbh->do(q{
+        DELETE FROM systempreferences WHERE variable="ExportWithCsvProfile";
+    });
+
+    print "Upgrade to $DBversion done (Bug 15498 - Replace ExportWithCsvProfile with ExportCircHistory)'\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.