From e72482340f8a0274a6489dc08c8f9e4ac80be5f3 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 9 Nov 2015 15:13:03 -0300 Subject: [PATCH] Bug 8064: DBRev 3.21.00.054 Signed-off-by: Tomas Cohen Arazi --- Koha.pm | 2 +- .../atomicupdate/8064_MergeReportFields_syspref.sql | 2 -- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/8064_MergeReportFields_syspref.sql diff --git a/Koha.pm b/Koha.pm index 1dbb0d1991..ce54d5217f 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 = "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 index 6441fee981..0000000000 --- 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 8a1d1b008c..b66371a997 100755 --- 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. -- 2.39.5