From bc8f7b35ee4543dd1b1dd8d764dcae32e6a853dd Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 30 Oct 2015 12:09:33 -0400 Subject: [PATCH] Bug 14610 [QA Followup] - Fix issuingrules database update --- installer/data/mysql/atomicupdate/bug_14610.sql | 2 +- installer/data/mysql/kohastructure.sql | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_14610.sql b/installer/data/mysql/atomicupdate/bug_14610.sql index 51b7366..08867de 100644 --- a/installer/data/mysql/atomicupdate/bug_14610.sql +++ b/installer/data/mysql/atomicupdate/bug_14610.sql @@ -1,4 +1,4 @@ -ALTER TABLE `issuingrules` ADD `article_requests` ENUM( 'no', 'yes', 'bib_only', 'item_only' ) NOT NULL DEFAULT 'no'; +ALTER TABLE `issuingrules` ADD `article_requests` ENUM( 'no', 'yes', 'bib_only', 'item_only' ) NOT NULL DEFAULT 'no' AFTER `opacitemholds`; INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('ArticleRequests', '1', NULL, 'Enables the article request feature', 'YesNo'), diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 9b601a5..4b0d7bc 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1190,6 +1190,7 @@ CREATE TABLE `issuingrules` ( -- circulation and fine rules overduefinescap decimal(28,6) default NULL, -- the maximum amount of an overdue fine onshelfholds tinyint(1) NOT NULL default 0, -- allow holds for items that are on shelf opacitemholds char(1) NOT NULL default 'N', -- allow opac users to place specific items on hold + article_requests enum('no','yes','bib_only','item_only') NOT NULL DEFAULT 'no', -- allow article requests to be placed, PRIMARY KEY (`branchcode`,`categorycode`,`itemtype`), KEY `categorycode` (`categorycode`), KEY `itemtype` (`itemtype`) @@ -3597,7 +3598,7 @@ CREATE TABLE `article_requests` ( `date` text, `pages` text, `chapters` text, - `status` enum('OPEN','PROCESSING','COMPLETED','CANCELED') NOT NULL DEFAULT 'OPEN', + `status` enum('PENDING','PROCESSING','COMPLETED','CANCELED') NOT NULL DEFAULT 'PENDING', `notes` text, `created_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `updated_on` timestamp NULL DEFAULT NULL, -- 1.7.2.5