From 78da33100def3b478d68cec25109449cc239597d Mon Sep 17 00:00:00 2001 From: Olli-Antti Kivilahti Date: Tue, 24 Feb 2015 19:00:23 +0200 Subject: [PATCH] Bug 7793: redefine the field message_id as PRIMARY KEY of message_queue Making message_queue work nicely with DBIx. DROP the existing KEY and replace with an PRIMARY KEY. If somebody has managed to get duplicate message_ids in his/her message_queue-table, this patch takes care of them as well, but givin all duplicate message_id's a new id. TEST INSTRUCTIONS: in the patch. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Amended patch: Remove change to Koha/Schema/Result/MessageQueue.pm, will be done by the RM Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 37 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 9d6e2ceeab..66895d1628 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2568,7 +2568,7 @@ CREATE TABLE `message_queue` ( `to_address` mediumtext, `from_address` mediumtext, `content_type` text, - KEY `message_id` (`message_id`), + PRIMARY KEY `message_id` (`message_id`), KEY `borrowernumber` (`borrowernumber`), KEY `message_transport_type` (`message_transport_type`), CONSTRAINT `messageq_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE, diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 38de9c82fa..5bd17474b8 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10606,6 +10606,43 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.21.00.XXX"; +if ( CheckVersion($DBversion) ) { + + #First make sure that there are no duplicate message_id's which might be quite impossible thanks to the AUTO_INCREMENT. + #If duplicates exists, find the next free message_id and UPDATE the duplicate message_queues with the new biggest id's. + my $sthGetDuplicatePKs = $dbh->prepare("SELECT count(message_id) as duplicate_pks, message_id ". + "FROM message_queue GROUP BY message_id HAVING duplicate_pks > 1;"); +#USE THIS TO TEST "FROM message_queue GROUP BY message_id HAVING duplicate_pks > 0;"); + my $sthGetMessage_queues = $dbh->prepare("SELECT * FROM message_queue WHERE message_id = ?"); + my $sthGetBiggestMessageId = $dbh->prepare("SELECT max(message_id) as message_id FROM message_queue;"); + my $sthUpdateMessageQueue = $dbh->prepare("UPDATE message_queue SET message_id = ? WHERE message_id = ? AND borrowernumber = ? AND time_queued = ? AND content = ?;"); + + #Get duplicate message_ids + $sthGetDuplicatePKs->execute; + my $message_ids = $sthGetDuplicatePKs->fetchall_arrayref({}); + foreach my $mi (@$message_ids) { + if ($mi->{duplicate_pks} > 1) { #Making sure there are multiple usages of this id +#USE TO TEST if ($mi->{duplicate_pks} > 0) { #Making sure we trigger this repair routine for messages with no duplicates, just to test. + $sthGetMessage_queues->execute($mi->{message_id}); #Get all the message_queues sharing the same id. + my $duplicates = $sthGetMessage_queues->fetchall_arrayref({}); + my $firstRun = 1; #On the first replace run for this set of duplicates, preserve the original id. + foreach my $duplicate (@$duplicates) { + next if $firstRun-- == 1; #Preserve the original id for the first conflicting message_queue-row + $sthGetBiggestMessageId->execute(); + my $max_message_id = $sthGetBiggestMessageId->fetchrow(); + $max_message_id++; + $sthUpdateMessageQueue->execute( $max_message_id, $duplicate->{message_id}, $duplicate->{borrowernumber}, $duplicate->{time_queued}, $duplicate->{content} ); + } + } + } + + #Finally add the PRIMARY KEY + $dbh->do( "ALTER TABLE message_queue DROP KEY message_id, ADD CONSTRAINT PRIMARY KEY (message_id);" ); + print "Upgrade to $DBversion done (Bug 7793 - redefine the field message_id as PRIMARY KEY of message_queue)\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.