From 0599e1835eb7689a23cee09c0f6c7606d1ac59c2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 8 Dec 2016 15:24:11 +0100 Subject: [PATCH] Bug 17762: Add lang to the PK of letter We need to enlarge the PK of the letter table. Sponsored-by: Orex Digital Signed-off-by: Hugo Agud Signed-off-by: Nick Clemens --- installer/data/mysql/atomicupdate/bug_xxxxx.perl | 4 +++- installer/data/mysql/kohastructure.sql | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_xxxxx.perl b/installer/data/mysql/atomicupdate/bug_xxxxx.perl index 43d3c26..65dfbe6 100644 --- a/installer/data/mysql/atomicupdate/bug_xxxxx.perl +++ b/installer/data/mysql/atomicupdate/bug_xxxxx.perl @@ -11,7 +11,9 @@ if( CheckVersion( $DBversion ) ) { } # Add test on existene of this key - ALTER TABLE message_transports DROP FOREIGN KEY message_transports_ibfk_3; + $dbh->do( "ALTER TABLE message_transports DROP FOREIGN KEY message_transports_ibfk_3 "); + $dbh->do( "ALTER TABLE letter DROP PRIMARY KEY "); + $dbh->do( "ALTER TABLE letter ADD PRIMARY KEY (`module`, `code`, `branchcode`, `message_transport_type`, `lang`) "); $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('TranslateNotices', '0', NULL, 'Allow notices to be translated', 'YesNo') "); diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index b202063..b71d427 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2542,7 +2542,7 @@ CREATE TABLE `letter` ( -- table for all notice templates in Koha `content` text, -- body text for the notice or slip `message_transport_type` varchar(20) NOT NULL DEFAULT 'email', -- transport type for this notice `lang` varchar(25) NOT NULL DEFAULT 'default', -- lang of the notice - PRIMARY KEY (`module`,`code`, `branchcode`, `message_transport_type`), + PRIMARY KEY (`module`,`code`, `branchcode`, `message_transport_type`, `lang`), CONSTRAINT `message_transport_type_fk` FOREIGN KEY (`message_transport_type`) REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- 2.1.4