From 0db15df0e51307bbe8482127d5f8510fcec63f55 Mon Sep 17 00:00:00 2001 From: Agustin Moyano Date: Tue, 30 Mar 2021 10:49:06 -0300 Subject: [PATCH] Bug 27944: Add new letter in atomicupdate, and modify status column in article_requests table --- .../data/mysql/atomicupdate/bug_27944.perl | 30 +++++++++++++++++++ installer/data/mysql/kohastructure.sql | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 installer/data/mysql/atomicupdate/bug_27944.perl diff --git a/installer/data/mysql/atomicupdate/bug_27944.perl b/installer/data/mysql/atomicupdate/bug_27944.perl new file mode 100644 index 0000000000..29494d7ed9 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_27944.perl @@ -0,0 +1,30 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if ( CheckVersion($DBversion) ) { + + # you can use $dbh here like: + $dbh->do( +"ALTER TABLE `article_requests` MODIFY `status` enum('REQUESTED', 'PENDING','PROCESSING','COMPLETED','CANCELED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'REQUESTED'" + ); + + $dbh->do( + q{ + UPDATE `letter` + SET `content` = 'Dear <> <> (<>)\r\n\r\nYour request for an article from <> (<>) is now in pending state.\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n\r\n\r\nThank you!', + `title` = 'Pending article request' + WHERE `module` = 'circulation' + AND `code` = 'AR_PENDING' + } + ); + + $dbh->do( + q{ + INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES + ('circulation', 'AR_REQUESTED', '', 'Article requested', 0, 'Article request received', '<> <> (<>)\r\n\r\nWe have received your request for an article from <> (<>).\r\n\r\nArticle requested:\r\nTitle: <>\r\nAuthor: <>\r\nVolume: <>\r\nIssue: <>\r\nDate: <>\r\nPages: <>\r\nChapters: <>\r\nNotes: <>\r\n\r\n\r\nThank you!', 'email') + } + ); + + # Always end with this (adjust the bug info) + NewVersion( $DBversion, 27944, +"Add REQUESTED as enum element for status column, update AR_PENDING letter and add new AR_REQUESTED letter" + ); +} diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index ae247e67c8..b6c637e045 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -764,7 +764,7 @@ CREATE TABLE `article_requests` ( `pages` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `chapters` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `patron_notes` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `status` enum('PENDING','PROCESSING','COMPLETED','CANCELED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'PENDING', + `status` enum('REQUESTED', 'PENDING','PROCESSING','COMPLETED','CANCELED') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'REQUESTED', `notes` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `created_on` timestamp NULL DEFAULT NULL COMMENT 'Be careful with two timestamps in one table not allowing NULL', `updated_on` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), -- 2.25.0