SAK-31315 Backport DB changes from SAK-31184 (sakaiproject#2761)

This change backports only the database changes from SAK-31184 in order to reduce migration issues in the future.
Oasis256 · Jun 17, 2016 · 84adc32 · 84adc32
1 parent caf3867
commit 84adc32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/reference/docs/conversion/sakai_11_mysql_conversion.sql b/reference/docs/conversion/sakai_11_mysql_conversion.sql
@@ -418,13 +418,13 @@ INSERT INTO SAKAI_REALM_RL_FN VALUES((select REALM_KEY from SAKAI_REALM where RE
 INSERT INTO SAKAI_REALM_RL_FN VALUES((select REALM_KEY from SAKAI_REALM where REALM_ID = '!site.template.lti'), (select ROLE_KEY from SAKAI_REALM_ROLE where ROLE_NAME = 'Instructor'), (select FUNCTION_KEY from SAKAI_REALM_FUNCTION where FUNCTION_NAME = 'calendar.view.audience'));
 -- END SAK-29497
 
--- SAK-29271 Feedback Tool
+-- SAK-29271 / SAK-31315 Feedback Tool
 CREATE TABLE IF NOT EXISTS sakai_feedback (
                 id INT NOT NULL AUTO_INCREMENT,
                 user_id VARCHAR(99),
                 email VARCHAR(255) NOT NULL,
                 site_id VARCHAR(99) NOT NULL,
-                report_type ENUM('content','technical', 'helpdesk') NOT NULL,
+                report_type ENUM('content','technical', 'helpdesk', 'suggestions', 'supplementala', 'supplementalb') NOT NULL,
                 title VARCHAR(40) NOT NULL,
                 content TEXT NOT NULL, PRIMARY KEY(id));
 INSERT INTO SAKAI_SITE VALUES('!contact-us', 'Contact Us', null, null, null, '', '', null, 1, 0, 0, '', 'admin', 'admin', NOW(), NOW(), 1, 0, 0, 0, null);

diff --git a/reference/docs/conversion/sakai_11_oracle_conversion.sql b/reference/docs/conversion/sakai_11_oracle_conversion.sql
@@ -431,7 +431,7 @@ INSERT INTO SAKAI_REALM_RL_FN VALUES((select REALM_KEY from SAKAI_REALM where RE
 INSERT INTO SAKAI_REALM_RL_FN VALUES((select REALM_KEY from SAKAI_REALM where REALM_ID = '!site.template.lti'), (select ROLE_KEY from SAKAI_REALM_ROLE where ROLE_NAME = 'Instructor'), (select FUNCTION_KEY from SAKAI_REALM_FUNCTION where FUNCTION_NAME = 'calendar.view.audience'));
 -- END SAK-29497
 
--- SAK-29271 Feedback Tool
+-- SAK-29271 / SAK-31315 Feedback Tool
 CREATE TABLE sakai_feedback (
                 id number not null primary key,
                 user_id varchar2(99) null,
@@ -440,7 +440,7 @@ CREATE TABLE sakai_feedback (
                 report_type varchar2(15) not null,
                 title varchar2(40) not null,
                 content varchar2(4000) not null,
-                CONSTRAINT cons_report_type CHECK (report_type IN ('content','technical', 'helpdesk')));
+                CONSTRAINT cons_report_type CHECK (report_type IN ('content','technical', 'helpdesk', 'suggestions', 'supplementala', 'supplementalb')));
 CREATE SEQUENCE sakai_feedback_seq START WITH 1 INCREMENT BY 1 nomaxvalue;
 INSERT INTO SAKAI_SITE VALUES('!contact-us', 'Contact Us', null, null, null, '', '', null, 1, 0, 0, '', 'admin', 'admin', sysdate, sysdate, 1, 0, 0, 0, null);
 INSERT INTO SAKAI_SITE_PAGE VALUES('!contact-us', '!contact-us', 'Contact Us', '0', 1, '0' );