Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql =================================================================== diff -u -r48d69a695c959dec6d2091243d297a915d14f9fb -r81fcd69ba653630d8b86561657f00fdbe838d022 --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql (.../patch20190722.sql) (revision 48d69a695c959dec6d2091243d297a915d14f9fb) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql (.../patch20190722.sql) (revision 81fcd69ba653630d8b86561657f00fdbe838d022) @@ -45,10 +45,11 @@ CREATE TABLE lams_qb_tool_question (`tool_question_uid` BIGINT AUTO_INCREMENT, `qb_question_uid` BIGINT NOT NULL, `tool_content_id` BIGINT NOT NULL, - `display_order` TINYINT NOT NULL DEFAULT 1, + `display_order` TINYINT UNSIGNED NOT NULL DEFAULT 1, PRIMARY KEY (tool_question_uid), INDEX (tool_content_id), CONSTRAINT FK_lams_qb_tool_question_1 FOREIGN KEY (qb_question_uid) REFERENCES lams_qb_question (uid) ON UPDATE CASCADE); + -- create Question Bank option CREATE TABLE lams_qb_option (`uid` BIGINT AUTO_INCREMENT, `qb_question_uid` BIGINT NOT NULL, @@ -158,6 +159,16 @@ DROP COLUMN mark, DROP COLUMN display_order, DROP COLUMN feedback; + +-- add missing display order in options, if any +UPDATE tl_lamc11_options_content AS c + JOIN (SELECT MIN(uid)-1 AS uid_shift, mc_que_content_id + FROM tl_lamc11_options_content + WHERE displayOrder IS NULL + GROUP BY mc_que_content_id) AS s + USING (mc_que_content_id) + SET c.displayOrder = c.uid - s.uid_shift + WHERE c.displayOrder IS NULL; -- fill table with options matching unique QB questions inserted above INSERT INTO lams_qb_option (qb_question_uid, display_order, name, max_mark) Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200519.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200519.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200519.sql (revision 81fcd69ba653630d8b86561657f00fdbe838d022) @@ -0,0 +1,11 @@ +SET AUTOCOMMIT = 0; +set FOREIGN_KEY_CHECKS = 0; + +-- LDEV-4746 Allow more options in a QB question + +ALTER TABLE lams_qb_tool_question MODIFY COLUMN display_order TINYINT UNSIGNED NOT NULL DEFAULT 1; + +COMMIT; +SET AUTOCOMMIT = 1; +set FOREIGN_KEY_CHECKS = 1; +