Bug 8064: DBRev 3.21.00.054

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/Koha.pm b/Koha.pm
index 1dbb0d1..ce54d52 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 = "3.21.00.053";
+$VERSION = "3.21.00.054";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/8064_MergeReportFields_syspref.sql b/installer/data/mysql/atomicupdate/8064_MergeReportFields_syspref.sql
deleted file mode 100644 (file)
index 6441fee..0000000
--- a/installer/data/mysql/atomicupdate/8064_MergeReportFields_syspref.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO systempreferences (variable,value,explanation,options,type)
-VALUES('MergeReportFields','','Displayed fields for deleted MARC records after merge',NULL,'Free');

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 8a1d1b0..b66371a 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -11341,6 +11341,16 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.21.00.054";
+if(CheckVersion($DBversion)) {
+    $dbh->do(q{
+        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)
+        VALUES('MergeReportFields','','Displayed fields for deleted MARC records after merge',NULL,'Free')
+    });
+    print "Upgrade to $DBversion done (Bug 8064: Merge several biblio records)\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.