From 82d5f5aaa7b16ee1349bfb5e0ff69da4c8942fba Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Tue, 14 Feb 2017 08:42:04 +0100 Subject: [PATCH] Bug 9988: Table revision for need_merge_authorities MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to let merge do exactly the same when called from the merge cron job, we need three additional fields in the table. The use of these fields will be explained in a follow-up. Test plan: Run the dbrev (updatestructure step in webinstaller). Signed-off-by: Marcel de Rooy Also tested running kohastructure.sql for this table. Signed-off-by: Marc Véron Signed-off-by: Jacek Ablewicz --- installer/data/mysql/atomicupdate/bug_9988b_table.perl | 14 ++++++++++++++ installer/data/mysql/kohastructure.sql | 11 ++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_9988b_table.perl diff --git a/installer/data/mysql/atomicupdate/bug_9988b_table.perl b/installer/data/mysql/atomicupdate/bug_9988b_table.perl new file mode 100644 index 0000000..d3de620 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_9988b_table.perl @@ -0,0 +1,14 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( +q|ALTER TABLE need_merge_authorities +ADD COLUMN authid_new BIGINT AFTER authid, +ADD COLUMN reportxml text AFTER authid_new, +ADD COLUMN timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;| + ); + + $dbh->do( q|UPDATE need_merge_authorities SET authid_new=authid WHERE done<>1| ); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 9988 - Alter table need_merge_authorities)\n"; +} diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 076d745..261fb37 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1255,10 +1255,15 @@ CREATE TABLE `matchchecks` ( -- DROP TABLE IF EXISTS `need_merge_authorities`; -CREATE TABLE `need_merge_authorities` ( -- keeping track of authority records still to be merged by merge_authority cron job (used only if pref dontmerge is ON) +CREATE TABLE `need_merge_authorities` ( -- keeping track of authority records still to be merged by merge_authority cron job `id` int NOT NULL auto_increment PRIMARY KEY, -- unique id - `authid` bigint NOT NULL, -- reference to authority record - `done` tinyint DEFAULT 0 -- indication whether merge has been executed (0=not done, 1= done, 2= in progress) + `authid` bigint NOT NULL, -- reference to original authority record + `authid_new` bigint, -- reference to optional new authority record + `reportxml` text, -- xml showing original reporting tag + `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- date and time last modified + `done` tinyint DEFAULT 0 -- indication whether merge has been executed (0=not done, 1=done, 2=in progress) +-- Note: authid and authid_new should NOT be FOREIGN keys ! +-- authid may have been deleted; authid_new may be zero ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- -- 1.7.10.4