Index: lams_common/db/sql/create_integration_tables.sql =================================================================== diff -u -rd5a281b774f24a41894aac08200627f18e2b25e2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/db/sql/create_integration_tables.sql (.../create_integration_tables.sql) (revision d5a281b774f24a41894aac08200627f18e2b25e2) +++ lams_common/db/sql/create_integration_tables.sql (.../create_integration_tables.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -20,7 +20,7 @@ UNIQUE KEY `prefix` (`prefix`), KEY `orgid` (`orgid`), CONSTRAINT `lams_ext_server_org_map_fk` FOREIGN KEY (`orgid`) REFERENCES `lams_organisation` (`organisation_id`) ON DELETE CASCADE ON UPDATE CASCADE -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Table structure for table `lams_ext_course_class_map` @@ -36,7 +36,7 @@ KEY `ext_server_org_map_id` (`ext_server_org_map_id`), CONSTRAINT `lams_ext_course_class_map_fk1` FOREIGN KEY (`ext_server_org_map_id`) REFERENCES `lams_ext_server_org_map` (`sid`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `lams_ext_course_class_map_fk` FOREIGN KEY (`classid`) REFERENCES `lams_organisation` (`organisation_id`) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- @@ -53,7 +53,7 @@ KEY `ext_server_org_map_id` (`ext_server_org_map_id`), CONSTRAINT `lams_ext_user_userid_map_fk1` FOREIGN KEY (`ext_server_org_map_id`) REFERENCES `lams_ext_server_org_map` (`sid`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `lams_ext_user_userid_map_fk` FOREIGN KEY (`user_id`) REFERENCES `lams_user` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Table structure for table `lams_ext_server_tool_map` @@ -67,7 +67,7 @@ UNIQUE KEY unique_adapter_map (ext_server_org_map_id, tool_id), CONSTRAINT lams_ext_server_tool_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT lams_ext_server_tool_map_fk2 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) ON DELETE CASCADE ON UPDATE CASCADE -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Table structure for table `lams_ext_server_lesson_map` @@ -81,4 +81,4 @@ UNIQUE KEY `lesson_id` (`lesson_id`), CONSTRAINT lams_ext_server_lesson_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT lams_ext_server_lesson_map_fk2 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE -) TYPE=InnoDB; +) ENGINE=InnoDB; Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== diff -u -r192608ebab727b612fcc5bff809846856509a2df -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 192608ebab727b612fcc5bff809846856509a2df) +++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -3,19 +3,19 @@ gate_activity_level_id INT(11) NOT NULL DEFAULT 0 , description VARCHAR(128) NOT NULL , PRIMARY KEY (gate_activity_level_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_grouping_type ( grouping_type_id INT(11) NOT NULL , description VARCHAR(128) NOT NULL , PRIMARY KEY (grouping_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learning_activity_type ( learning_activity_type_id INT(11) NOT NULL DEFAULT 0 , description VARCHAR(255) NOT NULL , PRIMARY KEY (learning_activity_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learning_library ( learning_library_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -24,14 +24,14 @@ , valid_flag TINYINT(1) NOT NULL DEFAULT 1 , create_date_time DATETIME NOT NULL , PRIMARY KEY (learning_library_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_organisation_type ( organisation_type_id INT(3) NOT NULL , name VARCHAR(64) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (organisation_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE UNIQUE INDEX UQ_lams_organisation_type_name ON lams_organisation_type (name ASC); CREATE TABLE lams_role ( @@ -40,26 +40,26 @@ , description TEXT , create_date DATETIME NOT NULL , PRIMARY KEY (role_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE INDEX gname ON lams_role (name ASC); CREATE TABLE lams_tool_session_state ( tool_session_state_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (tool_session_state_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_lesson_state ( lesson_state_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (lesson_state_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_tool_session_type ( tool_session_type_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (tool_session_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_license ( license_id BIGINT(20) NOT NULL @@ -69,72 +69,72 @@ , default_flag TINYINT(1) NOT NULL DEFAULT 0 , picture_url VARCHAR(256) , PRIMARY KEY (license_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_copy_type ( copy_type_id TINYINT(4) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (copy_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_activity_category ( activity_category_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (activity_category_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_cr_workspace ( workspace_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT , name VARCHAR(255) NOT NULL , PRIMARY KEY (workspace_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_workspace COMMENT='Content repository workspace'; CREATE TABLE lams_cr_credential ( credential_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT , name VARCHAR(255) NOT NULL , password VARCHAR(255) NOT NULL , PRIMARY KEY (credential_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_credential COMMENT='Records the identification properties for a tool.'; CREATE TABLE lams_workspace_folder_type ( lams_workspace_folder_type_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (lams_workspace_folder_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_grouping_support_type ( grouping_support_type_id INT(3) NOT NULL , description VARCHAR(64) NOT NULL , PRIMARY KEY (grouping_support_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_log_event_type ( log_event_type_id INT(5) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (log_event_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_wkspc_fld_content_type ( content_type_id INT(3) NOT NULL AUTO_INCREMENT , description VARCHAR(64) NOT NULL , PRIMARY KEY (content_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_privilege ( privilege_id BIGINT(20) NOT NULL AUTO_INCREMENT , code VARCHAR(10) NOT NULL , description VARCHAR(255) , PRIMARY KEY (privilege_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE UNIQUE INDEX IX_lams_privilege_code ON lams_privilege (code ASC); CREATE TABLE lams_organisation_state ( organisation_state_id INT(3) NOT NULL , description VARCHAR(255) , PRIMARY KEY (organisation_state_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_supported_locale ( locale_id INTEGER NOT NULL AUTO_INCREMENT @@ -144,7 +144,7 @@ , direction VARCHAR(3) NOT NULL , fckeditor_code VARCHAR(10) , PRIMARY KEY (locale_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_supported_locale COMMENT='Describes the valid language/country combinations.'; ALTER TABLE lams_supported_locale MODIFY COLUMN language_iso_code VARCHAR(2) NOT NULL COMMENT 'ISO 639-1 Language Code (2 letter version) Java only supports 2 letter properly, not the 3 letter codes.'; @@ -155,7 +155,7 @@ authentication_method_type_id INT(3) NOT NULL , description VARCHAR(64) NOT NULL , PRIMARY KEY (authentication_method_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_authentication_method ( authentication_method_id BIGINT(20) NOT NULL @@ -166,7 +166,7 @@ , INDEX (authentication_method_type_id) , CONSTRAINT FK_lams_authorization_method_1 FOREIGN KEY (authentication_method_type_id) REFERENCES lams_auth_method_type (authentication_method_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_workspace_folder ( workspace_folder_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -183,7 +183,7 @@ , INDEX (lams_workspace_folder_type_id) , CONSTRAINT FK_lams_workspace_folder_4 FOREIGN KEY (lams_workspace_folder_type_id) REFERENCES lams_workspace_folder_type (lams_workspace_folder_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_workspace ( workspace_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -197,7 +197,7 @@ , INDEX (default_fld_id) , CONSTRAINT FK_lams_workspace_2 FOREIGN KEY (default_fld_id) REFERENCES lams_workspace_folder (workspace_folder_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_wkspc_wkspc_folder ( id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -210,7 +210,7 @@ , INDEX (workspace_folder_id) , CONSTRAINT FK_lams_ww_folder_2 FOREIGN KEY (workspace_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_organisation ( organisation_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -249,7 +249,7 @@ , INDEX (locale_id) , CONSTRAINT FK_lams_organisation_5 FOREIGN KEY (locale_id) REFERENCES lams_supported_locale (locale_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_theme ( theme_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -259,7 +259,7 @@ , theme_type TINYINT(11) , PRIMARY KEY (theme_id) , UNIQUE UQ_name (name) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_user ( user_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -315,7 +315,7 @@ , CONSTRAINT FK_lams_user_6 FOREIGN KEY (locale_id) REFERENCES lams_supported_locale (locale_id) ON DELETE NO ACTION ON UPDATE NO ACTION , INDEX idx_openid_url (openid_url) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_user MODIFY COLUMN chat_id VARCHAR(255) COMMENT 'ID used for Jabber'; CREATE UNIQUE INDEX UQ_lams_user_login ON lams_user (login ASC); @@ -367,7 +367,7 @@ , INDEX (edit_override_user_id) , CONSTRAINT FK_lams_learning_design_7 FOREIGN KEY (edit_override_user_id) REFERENCES lams_user (user_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE INDEX idx_design_parent_id ON lams_learning_design (original_learning_design_id ASC); CREATE INDEX idx_design_first_act ON lams_learning_design (first_activity_id ASC); CREATE INDEX idx_design_floating_act ON lams_learning_design (floating_activity_id ASC); @@ -386,7 +386,7 @@ , INDEX (grouping_type_id) , CONSTRAINT FK_lams_learning_grouping_1 FOREIGN KEY (grouping_type_id) REFERENCES lams_grouping_type (grouping_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_group ( group_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -398,7 +398,7 @@ , INDEX (grouping_id) , CONSTRAINT FK_lams_learning_group_1 FOREIGN KEY (grouping_id) REFERENCES lams_grouping (grouping_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_system_tool ( system_tool_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -421,7 +421,7 @@ , INDEX (learning_activity_type_id) , CONSTRAINT FK_lams_system_tool FOREIGN KEY (learning_activity_type_id) REFERENCES lams_learning_activity_type (learning_activity_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_system_tool MODIFY COLUMN learner_preview_url TEXT COMMENT 'Learner screen for preview a learning design. '; ALTER TABLE lams_system_tool MODIFY COLUMN learner_progress_url TEXT @@ -467,7 +467,7 @@ , INDEX (grouping_support_type_id) , CONSTRAINT FK_lams_tool_2 FOREIGN KEY (grouping_support_type_id) REFERENCES lams_grouping_support_type (grouping_support_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_tool MODIFY COLUMN learner_preview_url TEXT COMMENT 'Learner screen for preview a learning design. '; ALTER TABLE lams_tool MODIFY COLUMN learner_progress_url TEXT @@ -559,7 +559,7 @@ , INDEX (system_tool_id) , CONSTRAINT FK_lams_learning_activity_14 FOREIGN KEY (system_tool_id) REFERENCES lams_system_tool (system_tool_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_planner_activity_metadata ( activity_id BIGINT(20) NOT NULL @@ -569,7 +569,7 @@ , editing_advice VARCHAR(255) , CONSTRAINT FK_lams_planner_metadata_primary FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_input_activity ( activity_id BIGINT(20) NOT NULL @@ -581,7 +581,7 @@ , INDEX (activity_id) , CONSTRAINT FK_lams_input_activity_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_branch_condition ( condition_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -594,7 +594,7 @@ , end_value VARCHAR(255) , exact_match_value VARCHAR(255) , PRIMARY KEY (condition_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_text_search_condition ( condition_id BIGINT(20) NOT NULL @@ -605,7 +605,7 @@ , PRIMARY KEY (condition_id) , CONSTRAINT TextSearchConditionInheritance FOREIGN KEY (condition_id) REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_branch_activity_entry ( entry_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -628,7 +628,7 @@ , INDEX (condition_id) , CONSTRAINT FK_lams_branch_activity_entry_4 FOREIGN KEY (condition_id) REFERENCES lams_branch_condition (condition_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; @@ -672,7 +672,7 @@ , INDEX (class_grouping_id) , CONSTRAINT FK_lams_lesson_5 FOREIGN KEY (class_grouping_id) REFERENCES lams_grouping (grouping_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_user_organisation ( @@ -686,7 +686,7 @@ , INDEX (user_id) , CONSTRAINT FK_lams_user_organisation_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learner_progress ( learner_progress_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -716,7 +716,7 @@ , INDEX (previous_activity_id) , CONSTRAINT FK_lams_learner_progress_5 FOREIGN KEY (previous_activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE UNIQUE INDEX IX_lams_learner_progress_1 ON lams_learner_progress (user_id ASC, lesson_id ASC); CREATE TABLE lams_cr_node ( @@ -731,7 +731,7 @@ , INDEX (workspace_id) , CONSTRAINT FK_lams_cr_node_1 FOREIGN KEY (workspace_id) REFERENCES lams_cr_workspace (workspace_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_node COMMENT='The main table containing the node definition'; CREATE TABLE lams_cr_node_version ( @@ -744,7 +744,7 @@ , INDEX (node_id) , CONSTRAINT FK_lams_cr_node_version_2 FOREIGN KEY (node_id) REFERENCES lams_cr_node (node_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_node_version COMMENT='Represents a version of a node'; @@ -759,7 +759,7 @@ , INDEX (user_organisation_id) , CONSTRAINT FK_lams_user_organisation_role_3 FOREIGN KEY (user_organisation_id) REFERENCES lams_user_organisation (user_organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_tool_session ( tool_session_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -789,7 +789,7 @@ , INDEX (group_id) , CONSTRAINT FK_lams_tool_session_1 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_progress_completed ( learner_progress_id BIGINT(20) NOT NULL @@ -803,7 +803,7 @@ , INDEX (activity_id) , CONSTRAINT FK_lams_progress_completed_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_progress_attempted ( learner_progress_id BIGINT(20) NOT NULL @@ -816,7 +816,7 @@ , INDEX (activity_id) , CONSTRAINT FK_lams_progress_current_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_user_group ( user_id BIGINT(20) NOT NULL @@ -829,7 +829,7 @@ , INDEX (group_id) , CONSTRAINT FK_lams_user_group_2 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_tool_content ( tool_content_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -838,7 +838,7 @@ , INDEX (tool_id) , CONSTRAINT FK_lams_tool_content_1 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_activity_learners ( user_id BIGINT(20) NOT NULL DEFAULT 0 @@ -850,7 +850,7 @@ , INDEX (activity_id) , CONSTRAINT FK_TABLE_32_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_lesson_learner ( lesson_id BIGINT(20) NOT NULL @@ -861,7 +861,7 @@ , INDEX (user_id) , CONSTRAINT FK_lams_lesson_learner_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_cr_workspace_credential ( wc_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT @@ -874,7 +874,7 @@ , INDEX (credential_id) , CONSTRAINT FK_lams_cr_workspace_credential_2 FOREIGN KEY (credential_id) REFERENCES lams_cr_credential (credential_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_workspace_credential COMMENT='Maps tools access to workspaces'; CREATE TABLE lams_cr_node_version_property ( @@ -887,7 +887,7 @@ , INDEX (nv_id) , CONSTRAINT FK_lams_cr_node_version_property_1 FOREIGN KEY (nv_id) REFERENCES lams_cr_node_version (nv_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_log_event ( id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -910,7 +910,7 @@ REFERENCES lams_lesson (lesson_id) , CONSTRAINT FK_lams_event_log_5 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_workspace_folder_content ( folder_content_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -932,7 +932,7 @@ , INDEX (content_type_id) , CONSTRAINT FK_lams_workspace_folder_content_2 FOREIGN KEY (content_type_id) REFERENCES lams_wkspc_fld_content_type (content_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learning_transition ( transition_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -956,7 +956,7 @@ , INDEX (learning_design_id) , CONSTRAINT lddefn_transition_ibfk_1 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_learning_activity ADD CONSTRAINT FK_lams_learning_activity_15 FOREIGN KEY (transition_to_id) REFERENCES lams_learning_transition (transition_id) @@ -974,14 +974,14 @@ , INDEX (role_id) , CONSTRAINT FK_lams_role_privilege_2 FOREIGN KEY (role_id) REFERENCES lams_role (role_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_tool_import_support ( id BIGINT(20) NOT NULL AUTO_INCREMENT , installed_tool_signature VARCHAR(15) NOT NULL , supports_tool_signature VARCHAR(50) NOT NULL , PRIMARY KEY (id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_configuration ( config_key VARCHAR(30) NOT NULL @@ -991,30 +991,30 @@ , format VARCHAR(30) , required TINYINT NOT NULL DEFAULT 0 , PRIMARY KEY (config_key) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_timezone ( id BIGINT(20) NOT NULL AUTO_INCREMENT , timezone_id VARCHAR(255) NOT NULL , server_timezone TINYINT DEFAULT 0 , PRIMARY KEY (id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_user_organisation_collapsed ( user_organisation_id BIGINT(20) NOT NULL , collapsed TINYINT(1) NOT NULL DEFAULT 1 , PRIMARY KEY (user_organisation_id) , CONSTRAINT FK_lams_user_organisation_collapsed_1 FOREIGN KEY (user_organisation_id) REFERENCES lams_user_organisation (user_organisation_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_password_request ( request_id BIGINT(20) NOT NULL AUTO_INCREMENT , user_id BIGINT(20) NOT NULL , request_key VARCHAR(32) NOT NULL , request_date DATETIME NOT NULL , PRIMARY KEY (request_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE UNIQUE INDEX IX_lams_psswd_rqst_key ON lams_password_request (request_key ASC); CREATE TABLE lams_events ( @@ -1030,7 +1030,7 @@ , fail_time DATETIME , INDEX (scope,name,event_session_id) , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_event_subscriptions ( uid BIGINT NOT NULL UNIQUE auto_increment @@ -1046,7 +1046,7 @@ , INDEX (event_uid) , CONSTRAINT EventSubscriptionsToEvent FOREIGN KEY (event_uid) REFERENCES lams_events (uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_competence ( competence_id BIGINT NOT NULL UNIQUE auto_increment @@ -1057,7 +1057,7 @@ , PRIMARY KEY (competence_id) , CONSTRAINT LearningDesignCompetenceMap FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design(learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_competence_mapping ( competence_mapping_id BIGINT NOT NULL UNIQUE auto_increment @@ -1070,15 +1070,15 @@ REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT FK_lams_competence_mapping_2 FOREIGN KEY (competence_id) REFERENCES lams_competence (competence_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE patches ( system_name VARCHAR(30) NOT NULL , patch_level INTEGER(11) NOT NULL , patch_date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , patch_in_progress CHAR(1) NOT NULL DEFAULT 'F' , PRIMARY KEY (system_name) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_registration ( uid BIGINT NOT NULL auto_increment @@ -1092,7 +1092,7 @@ , server_key VARCHAR(255) NOT NULL , server_id VARCHAR(255) NOT NULL , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_planner_nodes ( uid BIGINT(20) NOT NULL auto_increment, @@ -1112,7 +1112,7 @@ REFERENCES lams_planner_nodes(uid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT FK_lams_planner_node_user FOREIGN KEY (user_id) REFERENCES lams_user(user_id) ON DELETE SET NULL ON UPDATE SET NULL -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_activity_evaluation ( activity_evaluation_id BIGINT(20) NOT NULL auto_increment @@ -1122,7 +1122,7 @@ , CONSTRAINT FK_lams_activity_evaluation_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (activity_evaluation_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_gradebook_user_activity ( uid BIGINT(20) NOT NULL auto_increment @@ -1137,7 +1137,7 @@ , CONSTRAINT FK_lams_gradebook_user_activity_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_gradebook_user_lesson ( uid BIGINT(20) NOT NULL auto_increment @@ -1151,7 +1151,7 @@ , CONSTRAINT FK_lams_gradebook_user_lesson_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_data_flow ( data_flow_object_id BIGINT(20) NOT NULL auto_increment @@ -1163,15 +1163,15 @@ , CONSTRAINT FK_lams_learning_transition_1 FOREIGN KEY (transition_id) REFERENCES lams_learning_transition (transition_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (data_flow_object_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_user_disabled_tutorials ( user_id BIGINT(20) NOT NULL , page_str CHAR(5) NOT NULL , CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (user_id,page_str) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_planner_recent_learning_designs ( user_id BIGINT(20) NOT NULL @@ -1182,15 +1182,15 @@ , CONSTRAINT FK_lams_planner_recent_learning_designs_2 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (user_id,learning_design_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_planner_node_role ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , node_uid BIGINT(20) NOT NULL , user_id BIGINT(20) NOT NULL , role_id INT(6) NOT NULL , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_planner_node_role ADD CONSTRAINT FK_planner_node_role_user FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE NO ACTION; ALTER TABLE lams_planner_node_role ADD CONSTRAINT FK_planner_node_role_node FOREIGN KEY (node_uid) REFERENCES lams_planner_nodes (uid) ON DELETE CASCADE ON UPDATE NO ACTION; @@ -1200,7 +1200,7 @@ config_key VARCHAR(20) NOT NULL UNIQUE , config_value VARCHAR(255) NOT NULL , PRIMARY KEY (config_key) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_lesson_dependency ( lesson_id BIGINT(20) @@ -1210,4 +1210,4 @@ , CONSTRAINT FK_lams_lesson_dependency_2 FOREIGN KEY (preceding_lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (lesson_id,preceding_lesson_id) -)TYPE=InnoDB; \ No newline at end of file +)ENGINE=InnoDB; \ No newline at end of file Index: lams_common/db/sql/create_notebook_tables.sql =================================================================== diff -u -r98f10c35c8f290b7f3bcea1908f22cd77e7e8943 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/db/sql/create_notebook_tables.sql (.../create_notebook_tables.sql) (revision 98f10c35c8f290b7f3bcea1908f22cd77e7e8943) +++ lams_common/db/sql/create_notebook_tables.sql (.../create_notebook_tables.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -1,2 +1,2 @@ drop table if exists lams_notebook_entry; -create table lams_notebook_entry (uid bigint not null auto_increment, external_id bigint, external_id_type integer, external_signature varchar(255), user_id integer, title varchar(255), entry text, create_date datetime, last_modified datetime, primary key (uid))type=innodb; +create table lams_notebook_entry (uid bigint not null auto_increment, external_id bigint, external_id_type integer, external_signature varchar(255), user_id integer, title varchar(255), entry text, create_date datetime, last_modified datetime, primary key (uid))ENGINE=InnoDB; Index: lams_common/db/sql/create_presence_chat_tables.sql =================================================================== diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/db/sql/create_presence_chat_tables.sql (.../create_presence_chat_tables.sql) (revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82) +++ lams_common/db/sql/create_presence_chat_tables.sql (.../create_presence_chat_tables.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -7,5 +7,5 @@ date_sent DATETIME, message VARCHAR(1023), PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; Index: lams_common/db/sql/create_quartz_table.sql =================================================================== diff -u -r98f10c35c8f290b7f3bcea1908f22cd77e7e8943 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/db/sql/create_quartz_table.sql (.../create_quartz_table.sql) (revision 98f10c35c8f290b7f3bcea1908f22cd77e7e8943) +++ lams_common/db/sql/create_quartz_table.sql (.../create_quartz_table.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -36,7 +36,7 @@ REQUESTS_RECOVERY VARCHAR(1) NOT NULL, JOB_DATA BLOB NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_JOB_LISTENERS ( @@ -46,7 +46,7 @@ PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) REFERENCES lams_qtz_JOB_DETAILS(JOB_NAME,JOB_GROUP) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_TRIGGERS ( @@ -68,7 +68,7 @@ PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) REFERENCES lams_qtz_JOB_DETAILS(JOB_NAME,JOB_GROUP) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_SIMPLE_TRIGGERS ( @@ -80,7 +80,7 @@ PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_CRON_TRIGGERS ( @@ -91,7 +91,7 @@ PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_BLOB_TRIGGERS ( @@ -101,7 +101,7 @@ PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_TRIGGER_LISTENERS ( @@ -111,23 +111,23 @@ PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES lams_qtz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_CALENDARS ( CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BLOB NOT NULL, PRIMARY KEY (CALENDAR_NAME) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_PAUSED_TRIGGER_GRPS ( TRIGGER_GROUP VARCHAR(80) NOT NULL, PRIMARY KEY (TRIGGER_GROUP) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_FIRED_TRIGGERS ( @@ -143,7 +143,7 @@ IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_SCHEDULER_STATE ( @@ -152,13 +152,13 @@ CHECKIN_INTERVAL BIGINT(13) NOT NULL, RECOVERER VARCHAR(80) NULL, PRIMARY KEY (INSTANCE_NAME) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_qtz_LOCKS ( LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME) -)TYPE=InnoDB; +)ENGINE=InnoDB; INSERT INTO lams_qtz_LOCKS values('TRIGGER_ACCESS'); Index: lams_common/db/sql/updatescripts/alter_21_branching.sql =================================================================== diff -u -r54ef0116a2f7ec7ccb49f782a674229b66ab1c58 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 54ef0116a2f7ec7ccb49f782a674229b66ab1c58) +++ lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -14,7 +14,7 @@ , INDEX (activity_id) , CONSTRAINT FK_lams_input_activity_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_branch_condition ( @@ -28,7 +28,7 @@ , end_value VARCHAR(255) , exact_match_value VARCHAR(255) , PRIMARY KEY (condition_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_branch_activity_entry ( entry_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -50,7 +50,7 @@ , INDEX (condition_id) , CONSTRAINT FK_lams_branch_activity_entry_4 FOREIGN KEY (condition_id) REFERENCES lams_branch_condition (condition_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_learning_activity ADD COLUMN default_activity_id BIGINT(20) @@ -119,7 +119,7 @@ , PRIMARY KEY (user_organisation_id) , CONSTRAINT FK_lams_user_organisation_collapsed_1 FOREIGN KEY (user_organisation_id) REFERENCES lams_user_organisation (user_organisation_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-1301 ALTER TABLE lams_configuration Index: lams_common/db/sql/updatescripts/alter_21_groupings_fckeditor.sql =================================================================== diff -u -r32467161bd028f7ab892df10a0c62a259c8379e1 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/db/sql/updatescripts/alter_21_groupings_fckeditor.sql (.../alter_21_groupings_fckeditor.sql) (revision 32467161bd028f7ab892df10a0c62a259c8379e1) +++ lams_common/db/sql/updatescripts/alter_21_groupings_fckeditor.sql (.../alter_21_groupings_fckeditor.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -41,7 +41,7 @@ , request_key VARCHAR(32) NOT NULL , request_date DATETIME NOT NULL , PRIMARY KEY (request_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE UNIQUE INDEX IX_lams_psswd_rqst_key ON lams_password_request (request_key ASC); CREATE INDEX email ON lams_user (email ASC); Index: lams_common/db/sql/updatescripts/alter_22_competence.sql =================================================================== diff -u -r6a6dbb890b8b40648a8fbd8e7fa6fbd36cbbdbe9 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/db/sql/updatescripts/alter_22_competence.sql (.../alter_22_competence.sql) (revision 6a6dbb890b8b40648a8fbd8e7fa6fbd36cbbdbe9) +++ lams_common/db/sql/updatescripts/alter_22_competence.sql (.../alter_22_competence.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -7,7 +7,7 @@ , PRIMARY KEY (competence_id) , CONSTRAINT LearningDesignCompetenceMap FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design(learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_competence_mapping ( competence_mapping_id BIGINT NOT NULL UNIQUE auto_increment @@ -20,4 +20,4 @@ REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT FK_lams_competence_mapping_2 FOREIGN KEY (competence_id) REFERENCES lams_competence (competence_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; \ No newline at end of file +)ENGINE=InnoDB; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql =================================================================== diff -u -rca2308f2b386210f571828e9397f39d0327b0597 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql (.../patch0013_updateFrom21.sql) (revision ca2308f2b386210f571828e9397f39d0327b0597) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql (.../patch0013_updateFrom21.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -19,7 +19,7 @@ , fail_time DATETIME , INDEX (scope,name,event_session_id) , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_event_subscriptions ( uid BIGINT NOT NULL UNIQUE auto_increment @@ -35,7 +35,7 @@ , INDEX (event_uid) , CONSTRAINT EventSubscriptionsToEvent FOREIGN KEY (event_uid) REFERENCES lams_events (uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV1909 - Competence Editor Update Scripts --------------------------------- CREATE TABLE lams_competence ( @@ -47,7 +47,7 @@ , PRIMARY KEY (competence_id) , CONSTRAINT LearningDesignCompetenceMap FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design(learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_competence_mapping ( competence_mapping_id BIGINT NOT NULL UNIQUE auto_increment @@ -60,7 +60,7 @@ REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT FK_lams_competence_mapping_2 FOREIGN KEY (competence_id) REFERENCES lams_competence (competence_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-1604 - Text based complex conditions ----------------------------------- CREATE TABLE lams_text_search_condition ( @@ -72,7 +72,7 @@ , PRIMARY KEY (condition_id) , CONSTRAINT TextSearchConditionInheritance FOREIGN KEY (condition_id) REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV1929 - Updated script for lesson creation with presence -------------- ALTER TABLE lams_lesson ADD COLUMN learner_presence_avail TINYINT(1) DEFAULT 0; Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql (.../patch0015_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql (.../patch0015_updateFrom22.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -26,7 +26,7 @@ UNIQUE KEY (parent_uid, order_id), CONSTRAINT FK_lams_planner_node_parent FOREIGN KEY (parent_uid) REFERENCES lams_planner_nodes(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-2074 -------------- ALTER TABLE lams_learning_design ADD COLUMN floating_activity_id BIGINT(20); CREATE INDEX idx_design_floating_act ON lams_learning_design (floating_activity_id ASC); @@ -55,7 +55,7 @@ , server_key VARCHAR(255) NOT NULL , server_id VARCHAR(255) NOT NULL , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-2107 -------------- INSERT into lams_workspace_folder_type VALUES (3, 'PUBLIC SEQUENCES'); @@ -76,7 +76,7 @@ , CONSTRAINT FK_lams_activity_evaluation_1 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (activity_evaluation_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-2174 ------------- ALTER TABLE lams_tool DROP COLUMN classpath_addition; @@ -100,7 +100,7 @@ , CONSTRAINT FK_lams_gradebook_user_activity_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_gradebook_user_lesson ( uid BIGINT(20) NOT NULL auto_increment @@ -114,7 +114,7 @@ , CONSTRAINT FK_lams_gradebook_user_lesson_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-2207 ------------ Adding flag in lesson to release marks for gradebook ALTER TABLE lams_lesson ADD COLUMN marks_released TINYINT DEFAULT 0; @@ -138,7 +138,7 @@ date_sent DATETIME, message VARCHAR(1023), PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-2005 Video Recorder configuration stuff -------------- insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql =================================================================== diff -u -r88c27e0aebd5d2edf351a8a9991d3b2ec5d72fb7 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql (.../patch0017_updateFrom23-231.sql) (revision 88c27e0aebd5d2edf351a8a9991d3b2ec5d72fb7) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql (.../patch0017_updateFrom23-231.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -20,7 +20,7 @@ UNIQUE KEY unique_adapter_map (ext_server_org_map_id, tool_id), CONSTRAINT lams_ext_server_tool_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT lams_ext_server_tool_map_fk2 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) ON DELETE CASCADE ON UPDATE CASCADE -) TYPE=InnoDB; +) ENGINE=InnoDB; -- LDEV-2369 Add tutorial video support ALTER TABLE lams_user ADD COLUMN tutorials_disabled TINYINT(1) DEFAULT 0, @@ -31,7 +31,7 @@ page_str CHAR(5) NOT NULL, CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE, PRIMARY KEY (user_id,page_str) -)TYPE=InnoDB; +)ENGINE=InnoDB; ----------------------Put all sql statements above here------------------------- Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040000.sql =================================================================== diff -u -r567dbfb08180fe6e74ff2842ebcd006fa7d282e6 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040000.sql (.../patch02040000.sql) (revision 567dbfb08180fe6e74ff2842ebcd006fa7d282e6) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040000.sql (.../patch02040000.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -12,7 +12,7 @@ , CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (user_id,page_str) -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-2374 ALTER TABLE lams_learning_activity ADD COLUMN transition_to_id BIGINT(20); @@ -37,7 +37,7 @@ , CONSTRAINT FK_lams_learning_transition_1 FOREIGN KEY (transition_id) REFERENCES lams_learning_transition (transition_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (data_flow_object_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; COMMIT; SET AUTOCOMMIT = 1; Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040004.sql =================================================================== diff -u -rab19db088359a46353cc92e806c40ff5cff818b9 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040004.sql (.../patch02040004.sql) (revision ab19db088359a46353cc92e806c40ff5cff818b9) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040004.sql (.../patch02040004.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -8,7 +8,7 @@ config_key VARCHAR(20) NOT NULL , config_value VARCHAR(255) NOT NULL , PRIMARY KEY (config_key) -)TYPE=InnoDB; +)ENGINE=InnoDB; INSERT INTO lams_openid_config(config_key, config_value) values ("enabled", "false"); INSERT INTO lams_openid_config(config_key, config_value) values ("portalURL", ""); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql =================================================================== diff -u -r192608ebab727b612fcc5bff809846856509a2df -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql (.../patch02040006.sql) (revision 192608ebab727b612fcc5bff809846856509a2df) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql (.../patch02040006.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -30,7 +30,7 @@ REFERENCES lams_lesson (lesson_id) , CONSTRAINT FK_lams_event_log_5 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; DELETE FROM lams_log_event_type; INSERT INTO lams_log_event_type VALUES (1, 'TYPE_TEACHER_LEARNING_DESIGN_CREATE'); @@ -55,7 +55,7 @@ UNIQUE KEY `lesson_id` (`lesson_id`), CONSTRAINT lams_ext_server_lesson_map_fk1 FOREIGN KEY (ext_server_org_map_id) REFERENCES lams_ext_server_org_map (sid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT lams_ext_server_lesson_map_fk2 FOREIGN KEY (lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE -) TYPE=InnoDB; +) ENGINE=InnoDB; -- LDEV-2642 and LDEV-2646 Move metadata to separate table. Use LD ID rather than ZIPed file for template. CREATE TABLE lams_planner_activity_metadata ( @@ -66,7 +66,7 @@ , editing_advice VARCHAR(255) , CONSTRAINT FK_lams_planner_metadata_primary FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_planner_nodes DROP COLUMN file_uuid, DROP COLUMN file_name, ADD COLUMN ld_id BIGINT(20), ADD COLUMN teachers_permissions TINYINT UNSIGNED; @@ -119,7 +119,7 @@ , CONSTRAINT FK_lams_lesson_dependency_2 FOREIGN KEY (preceding_lesson_id) REFERENCES lams_lesson (lesson_id) ON DELETE CASCADE ON UPDATE CASCADE , PRIMARY KEY (lesson_id,preceding_lesson_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_lesson DROP COLUMN release_date; Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql =================================================================== diff -u -rf91a13ebf9fee21e228d82128ed50511ef8b4169 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql (.../create_lams_tool_assessment.sql) (revision f91a13ebf9fee21e228d82128ed50511ef8b4169) +++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql (.../create_lams_tool_assessment.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -19,7 +19,7 @@ create_date datetime, assessment_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_assessment ( uid bigint not null auto_increment, create_date datetime, @@ -48,7 +48,7 @@ shuffled tinyint, attempt_completion_notify tinyint DEFAULT 0, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_assessment_question ( uid bigint not null auto_increment, question_type smallint, @@ -72,7 +72,7 @@ assessment_uid bigint, session_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_question_reference ( uid bigint not null auto_increment, question_uid bigint, @@ -83,7 +83,7 @@ random_question tinyint DEFAULT 0, assessment_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_question_option ( uid bigint not null unique auto_increment, question_uid bigint, @@ -95,23 +95,23 @@ grade float, feedback text, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_assessment_overall_feedback ( uid bigint not null unique auto_increment, assessment_uid bigint, sequence_id integer, grade_boundary integer, feedback text, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_assessment_unit ( uid bigint not null unique auto_increment, question_uid bigint, sequence_id integer, multiplier float, unit varchar(255), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_assessment_result ( uid bigint not null auto_increment, assessment_uid bigint, @@ -122,7 +122,7 @@ maximum_grade integer, grade float, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_question_result ( uid bigint not null auto_increment, assessment_question_uid bigint, @@ -135,15 +135,15 @@ penalty float, finish_date datetime DEFAULT NULL, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_option_answer ( uid bigint not null unique auto_increment, question_result_uid bigint, question_option_uid bigint, answer_boolean boolean, answer_int integer, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_session ( uid bigint not null auto_increment, session_end_date datetime, @@ -153,7 +153,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laasse10_user ( uid bigint not null auto_increment, user_id bigint, @@ -164,7 +164,7 @@ session_uid bigint, assessment_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; alter table tl_laasse10_attachment add index FK_NEW_1720029621_1E7009430E79035 (assessment_uid), add constraint FK_NEW_1720029621_1E7009430E79035 foreign key (assessment_uid) references tl_laasse10_assessment (uid); alter table tl_laasse10_assessment add index FK_NEW_1720029621_89093BF758092FB (create_by), add constraint FK_NEW_1720029621_89093BF758092FB foreign key (create_by) references tl_laasse10_user (uid); alter table tl_laasse10_assessment_question add index FK_NEW_1720029621_F52D1F93758092FB (create_by), add constraint FK_NEW_1720029621_F52D1F93758092FB foreign key (create_by) references tl_laasse10_user (uid); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql =================================================================== diff -u -rf91a13ebf9fee21e228d82128ed50511ef8b4169 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql (.../patch20110413_updateTo236.sql) (revision f91a13ebf9fee21e228d82128ed50511ef8b4169) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql (.../patch20110413_updateTo236.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -22,7 +22,7 @@ random_question tinyint DEFAULT 0, assessment_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; -- LDEV-2717 Add passing mark feature to assessment tool ALTER TABLE tl_laasse10_assessment ADD COLUMN passing_mark integer DEFAULT 0; Index: lams_tool_chat/db/sql/create_lams_tool_chat.sql =================================================================== diff -u -r9f7df51118e418eead64378c028572b0baf39196 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_chat/db/sql/create_lams_tool_chat.sql (.../create_lams_tool_chat.sql) (revision 9f7df51118e418eead64378c028572b0baf39196) +++ lams_tool_chat/db/sql/create_lams_tool_chat.sql (.../create_lams_tool_chat.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -9,11 +9,11 @@ drop table if exists tl_lachat11_user; drop table if exists tl_lachat11_conditions; -create table tl_lachat11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, chat_uid bigint, primary key (uid))type=innodb; -create table tl_lachat11_chat (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, filtering_enabled bit, filter_keywords text, submission_deadline datetime default null, primary key (uid))type=innodb; -create table tl_lachat11_message (uid bigint not null auto_increment, chat_session_uid bigint not null, from_user_uid bigint, to_user_uid bigint, type varchar(255), body text, send_date datetime, hidden bit, primary key (uid))type=innodb; -create table tl_lachat11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), chat_uid bigint, jabber_room varchar(250), room_created bit, primary key (uid))type=innodb; -create table tl_lachat11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), jabber_id varchar(255), finishedActivity bit, jabber_nickname varchar(255), chat_session_uid bigint, primary key (uid))type=innodb; +create table tl_lachat11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, chat_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lachat11_chat (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, filtering_enabled bit, filter_keywords text, submission_deadline datetime default null, primary key (uid))ENGINE=InnoDB; +create table tl_lachat11_message (uid bigint not null auto_increment, chat_session_uid bigint not null, from_user_uid bigint, to_user_uid bigint, type varchar(255), body text, send_date datetime, hidden bit, primary key (uid))ENGINE=InnoDB; +create table tl_lachat11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), chat_uid bigint, jabber_room varchar(250), room_created bit, primary key (uid))ENGINE=InnoDB; +create table tl_lachat11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), jabber_id varchar(255), finishedActivity bit, jabber_nickname varchar(255), chat_session_uid bigint, primary key (uid))ENGINE=InnoDB; CREATE TABLE tl_lachat11_conditions ( condition_id BIGINT(20) NOT NULL @@ -23,7 +23,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ChatConditionToChat FOREIGN KEY (content_uid) REFERENCES tl_lachat11_chat(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_lachat11_attachment add index FK9ED6CB2E1A3926E3 (chat_uid), add constraint FK9ED6CB2E1A3926E3 foreign key (chat_uid) references tl_lachat11_chat (uid); alter table tl_lachat11_message add index FKCC08C1DC2AF61E05 (to_user_uid), add constraint FKCC08C1DC2AF61E05 foreign key (to_user_uid) references tl_lachat11_user (uid); Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql (.../patch20081027_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20081027_updateFrom21.sql (.../patch20081027_updateFrom21.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -13,7 +13,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ChatConditionToChat FOREIGN KEY (content_uid) REFERENCES tl_lachat11_chat(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lachat11'; Index: lams_tool_daco/db/sql/create_lams_tool_daco.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_daco/db/sql/create_lams_tool_daco.sql (.../create_lams_tool_daco.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_daco/db/sql/create_lams_tool_daco.sql (.../create_lams_tool_daco.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -29,7 +29,7 @@ learner_entry_notify tinyint DEFAULT 0, record_submit_notify tinyint DEFAULT 0, PRIMARY KEY (uid) -)TYPE=innodb; +)ENGINE=InnoDB; CREATE TABLE tl_ladaco10_sessions ( uid bigint NOT NULL UNIQUE auto_increment, @@ -40,7 +40,7 @@ session_id bigint UNIQUE, session_name varchar(250), PRIMARY KEY (uid) -)TYPE=innodb; +)ENGINE=InnoDB; CREATE TABLE tl_ladaco10_attachments ( uid bigint NOT NULL UNIQUE auto_increment, @@ -51,7 +51,7 @@ create_date datetime , content_uid bigint, PRIMARY KEY (uid) -)TYPE=innodb; +)ENGINE=InnoDB; CREATE TABLE tl_ladaco10_questions ( uid bigint NOT NULL UNIQUE auto_increment, @@ -67,15 +67,15 @@ content_uid bigint, session_uid bigint, PRIMARY KEY (uid) -)TYPE=innodb; +)ENGINE=InnoDB; CREATE TABLE tl_ladaco10_answer_options (uid bigint NOT NULL UNIQUE auto_increment, question_uid bigint, sequence_num tinyint unsigned DEFAULT 1, answer_option varchar(255), PRIMARY KEY (uid)) -TYPE=innodb; +ENGINE=InnoDB; CREATE TABLE tl_ladaco10_users ( uid bigint NOT NULL auto_increment, @@ -87,7 +87,7 @@ session_uid bigint, content_uid bigint, PRIMARY KEY (uid) -)TYPE=innodb; +)ENGINE=InnoDB; CREATE TABLE tl_ladaco10_answers ( uid bigint NOT NULL UNIQUE auto_increment, @@ -101,7 +101,7 @@ file_version_id bigint, create_date datetime, PRIMARY KEY (uid) -)TYPE=innodb; +)ENGINE=InnoDB; ALTER TABLE tl_ladaco10_attachments ADD INDEX (content_uid), ADD CONSTRAINT FOREIGN KEY (content_uid) REFERENCES tl_ladaco10_contents (uid); ALTER TABLE tl_ladaco10_contents ADD INDEX (create_by), ADD CONSTRAINT DacoToUser FOREIGN KEY (create_by) REFERENCES tl_ladaco10_users (uid); Index: lams_tool_deploy/test/file/sql/create_tool_tables.sql =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_deploy/test/file/sql/create_tool_tables.sql (.../create_tool_tables.sql) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/test/file/sql/create_tool_tables.sql (.../create_tool_tables.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -26,7 +26,7 @@ initial_item varchar(255), organizationXML text, PRIMARY KEY (sid) -) TYPE=InnoDB COMMENT='Details of an IMS Content Package'; +) ENGINE=InnoDB COMMENT='Details of an IMS Content Package'; -- -- Table structure for table 'tool_imscp_userprogress' @@ -48,5 +48,5 @@ FOREIGN KEY (package_id) REFERENCES tool_imscp_package(sid) ON DELETE NO ACTION ON UPDATE NO ACTION -) TYPE=InnoDB COMMENT='Current state for a learner in a session'; +) ENGINE=InnoDB COMMENT='Current state for a learner in a session'; Index: lams_tool_deploy/test/file/sql/lams_common/create_lams_11_tables.sql =================================================================== diff -u -r2dc5d899da948b767363372a7c8349a760e64ec9 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_deploy/test/file/sql/lams_common/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 2dc5d899da948b767363372a7c8349a760e64ec9) +++ lams_tool_deploy/test/file/sql/lams_common/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -2,19 +2,19 @@ gate_activity_level_id INT(11) NOT NULL DEFAULT 0 , description VARCHAR(128) NOT NULL , PRIMARY KEY (gate_activity_level_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_grouping_type ( grouping_type_id INT(11) NOT NULL , description VARCHAR(128) NOT NULL , PRIMARY KEY (grouping_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learning_activity_type ( learning_activity_type_id INT(11) NOT NULL DEFAULT 0 , description VARCHAR(255) NOT NULL , PRIMARY KEY (learning_activity_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learning_library ( learning_library_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -23,14 +23,14 @@ , valid_flag TINYINT(1) NOT NULL DEFAULT 1 , create_date_time DATETIME NOT NULL , PRIMARY KEY (learning_library_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_organisation_type ( organisation_type_id INT(3) NOT NULL , name VARCHAR(64) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (organisation_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE UNIQUE INDEX UQ_lams_organisation_type_name ON lams_organisation_type (name ASC); CREATE TABLE lams_role ( @@ -39,26 +39,26 @@ , description TEXT , create_date DATETIME NOT NULL , PRIMARY KEY (role_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE INDEX gname ON lams_role (name ASC); CREATE TABLE lams_tool_session_state ( tool_session_state_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (tool_session_state_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_lesson_state ( lesson_state_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (lesson_state_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_tool_session_type ( tool_session_type_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (tool_session_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_license ( license_id BIGINT(20) NOT NULL @@ -68,64 +68,64 @@ , default_flag TINYINT(1) NOT NULL DEFAULT 0 , picture_url VARCHAR(256) , PRIMARY KEY (license_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_copy_type ( copy_type_id TINYINT(4) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (copy_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_activity_category ( activity_category_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (activity_category_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_cr_workspace ( workspace_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT , name VARCHAR(255) NOT NULL , PRIMARY KEY (workspace_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_workspace COMMENT='Content repository workspace'; CREATE TABLE lams_cr_credential ( credential_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT , name VARCHAR(255) NOT NULL , password VARCHAR(255) NOT NULL , PRIMARY KEY (credential_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_credential COMMENT='Records the identification properties for a tool.'; CREATE TABLE lams_workspace_folder_type ( lams_workspace_folder_type_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (lams_workspace_folder_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_grouping_support_type ( grouping_support_type_id INT(3) NOT NULL , description VARCHAR(64) NOT NULL , PRIMARY KEY (grouping_support_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_log_event_type ( log_event_type_id INT(5) NOT NULL , description VARCHAR(255) NOT NULL , PRIMARY KEY (log_event_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_workspace_folder_content_type ( content_type_id INT(3) NOT NULL AUTO_INCREMENT , description VARCHAR(64) NOT NULL , PRIMARY KEY (content_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_authentication_method_type ( authentication_method_type_id INT(3) NOT NULL , description VARCHAR(64) NOT NULL , PRIMARY KEY (authentication_method_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_authentication_method ( authentication_method_id BIGINT(20) NOT NULL @@ -136,7 +136,7 @@ , INDEX (authentication_method_type_id) , CONSTRAINT FK_lams_authorization_method_1 FOREIGN KEY (authentication_method_type_id) REFERENCES lams_authentication_method_type (authentication_method_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_workspace_folder ( workspace_folder_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -154,7 +154,7 @@ , INDEX (lams_workspace_folder_type_id) , CONSTRAINT FK_lams_workspace_folder_4 FOREIGN KEY (lams_workspace_folder_type_id) REFERENCES lams_workspace_folder_type (lams_workspace_folder_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_workspace ( workspace_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -164,7 +164,7 @@ , INDEX (root_folder_id) , CONSTRAINT FK_lams_workspace_1 FOREIGN KEY (root_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_organisation ( organisation_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -184,7 +184,7 @@ , INDEX (parent_organisation_id) , CONSTRAINT FK_lams_organisation_3 FOREIGN KEY (parent_organisation_id) REFERENCES lams_organisation (organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_css_theme_ve ( theme_ve_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -196,7 +196,7 @@ , INDEX (parent_id) , CONSTRAINT FK_lams_css_theme_ve_2 FOREIGN KEY (parent_id) REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_css_theme_ve COMMENT='Stores both the Flash theme and visual element'; CREATE TABLE lams_css_style ( @@ -206,7 +206,7 @@ , INDEX (theme_ve_id) , CONSTRAINT FK_lams_css_style_1 FOREIGN KEY (theme_ve_id) REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_css_style COMMENT='Groups lams_css_property into a CSSStyleDeclaration.'; CREATE TABLE lams_css_property ( @@ -220,7 +220,7 @@ -- , INDEX (style_id) -- , CONSTRAINT FK_lams_css_property_1 FOREIGN KEY (style_id) -- REFERENCES lams_css_style (style_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_user ( user_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -261,7 +261,7 @@ , INDEX (theme_id) , CONSTRAINT FK_lams_user_4 FOREIGN KEY (theme_id) REFERENCES lams_css_theme_ve (theme_ve_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE UNIQUE INDEX UQ_lams_user_login ON lams_user (login ASC); CREATE INDEX login ON lams_user (login ASC); @@ -309,7 +309,7 @@ , INDEX (copy_type_id) , CONSTRAINT FK_lams_learning_design_6 FOREIGN KEY (copy_type_id) REFERENCES lams_copy_type (copy_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE INDEX idx_design_first_act ON lams_learning_design (first_activity_id ASC); CREATE TABLE lams_grouping ( @@ -324,7 +324,7 @@ , INDEX (grouping_type_id) , CONSTRAINT FK_lams_learning_grouping_1 FOREIGN KEY (grouping_type_id) REFERENCES lams_grouping_type (grouping_type_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_group ( group_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -334,7 +334,7 @@ , INDEX (grouping_id) , CONSTRAINT FK_lams_learning_group_1 FOREIGN KEY (grouping_id) REFERENCES lams_grouping (grouping_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_tool ( tool_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -369,7 +369,7 @@ , INDEX (grouping_support_type_id) , CONSTRAINT FK_lams_tool_2 FOREIGN KEY (grouping_support_type_id) REFERENCES lams_grouping_support_type (grouping_support_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learning_activity ( activity_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -442,7 +442,7 @@ , INDEX (grouping_support_type_id) , CONSTRAINT FK_lams_learning_activity_13 FOREIGN KEY (grouping_support_type_id) REFERENCES lams_grouping_support_type (grouping_support_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_lesson ( lesson_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -474,7 +474,7 @@ , INDEX (class_grouping_id) , CONSTRAINT FK_lams_lesson_5 FOREIGN KEY (class_grouping_id) REFERENCES lams_grouping (grouping_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_user_organisation ( @@ -488,7 +488,7 @@ , INDEX (user_id) , CONSTRAINT FK_lams_user_organisation_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learner_progress ( learner_progress_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -518,7 +518,7 @@ , INDEX (previous_activity_id) , CONSTRAINT FK_lams_learner_progress_5 FOREIGN KEY (previous_activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_cr_node ( node_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT @@ -533,7 +533,7 @@ , INDEX (workspace_id) , CONSTRAINT FK_lams_cr_node_1 FOREIGN KEY (workspace_id) REFERENCES lams_cr_workspace (workspace_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_node COMMENT='The main table containing the node definition'; CREATE TABLE lams_cr_node_version ( @@ -546,7 +546,7 @@ , INDEX (node_id) , CONSTRAINT FK_lams_cr_node_version_2 FOREIGN KEY (node_id) REFERENCES lams_cr_node (node_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_node_version COMMENT='Represents a version of a node'; @@ -561,7 +561,7 @@ , INDEX (user_organisation_id) , CONSTRAINT FK_lams_user_organisation_role_3 FOREIGN KEY (user_organisation_id) REFERENCES lams_user_organisation (user_organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_tool_session ( tool_session_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -590,7 +590,7 @@ , INDEX (group_id) , CONSTRAINT FK_lams_tool_session_1 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_progress_completed ( learner_progress_id BIGINT(20) NOT NULL @@ -602,7 +602,7 @@ , INDEX (activity_id) , CONSTRAINT FK_lams_progress_completed_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_progress_attempted ( learner_progress_id BIGINT(20) NOT NULL @@ -614,7 +614,7 @@ , INDEX (activity_id) , CONSTRAINT FK_lams_progress_current_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_user_group ( user_id BIGINT(20) NOT NULL @@ -626,7 +626,7 @@ , INDEX (group_id) , CONSTRAINT FK_lams_user_group_2 FOREIGN KEY (group_id) REFERENCES lams_group (group_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_tool_content ( tool_content_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -635,7 +635,7 @@ , INDEX (tool_id) , CONSTRAINT FK_lams_tool_content_1 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_activity_learners ( user_id BIGINT(20) NOT NULL DEFAULT 0 @@ -646,7 +646,7 @@ , INDEX (activity_id) , CONSTRAINT FK_TABLE_32_2 FOREIGN KEY (activity_id) REFERENCES lams_learning_activity (activity_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_lesson_learner ( lesson_id BIGINT(20) NOT NULL @@ -657,7 +657,7 @@ , INDEX (user_id) , CONSTRAINT FK_lams_lesson_learner_2 FOREIGN KEY (user_id) REFERENCES lams_user (user_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_cr_workspace_credential ( wc_id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT @@ -670,7 +670,7 @@ , INDEX (credential_id) , CONSTRAINT FK_lams_cr_workspace_credential_2 FOREIGN KEY (credential_id) REFERENCES lams_cr_credential (credential_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE lams_cr_workspace_credential COMMENT='Maps tools access to workspaces'; CREATE TABLE lams_cr_node_version_property ( @@ -683,7 +683,7 @@ , INDEX (nv_id) , CONSTRAINT FK_lams_cr_node_version_property_1 FOREIGN KEY (nv_id) REFERENCES lams_cr_node_version (nv_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_log_event ( log_event_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -696,7 +696,7 @@ , INDEX (log_event_type_id) , CONSTRAINT FK_lams_event_log_1 FOREIGN KEY (log_event_type_id) REFERENCES lams_log_event_type (log_event_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_workspace_folder_content ( folder_content_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -718,7 +718,7 @@ , INDEX (content_type_id) , CONSTRAINT FK_lams_workspace_folder_content_2 FOREIGN KEY (content_type_id) REFERENCES lams_workspace_folder_content_type (content_type_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams_learning_transition ( transition_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -741,5 +741,5 @@ , INDEX (learning_design_id) , CONSTRAINT lddefn_transition_ibfk_1 FOREIGN KEY (learning_design_id) REFERENCES lams_learning_design (learning_design_id) ON DELETE NO ACTION ON UPDATE NO ACTION -)TYPE=InnoDB; +)ENGINE=InnoDB; Index: lams_tool_deploy/test/file/sql/test_script.sql =================================================================== diff -u -r922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_deploy/test/file/sql/test_script.sql (.../test_script.sql) (revision 922473f5ee7930d8f2ddbf3f3e2d1d00cd9deee9) +++ lams_tool_deploy/test/file/sql/test_script.sql (.../test_script.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -12,7 +12,7 @@ TEST_1_INT INT, TEST_1_STR VARCHAR(255), #asdadasdsd TEST_1_DATE DATETIME -) TYPE=InnoDB; +) ENGINE=InnoDB; -- more comments INSERT INTO TEST_1 VALUES (1, 'foo', NOW()); Index: lams_tool_eadventure/db/sql/create_lams_tool_eadventure.sql =================================================================== diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_eadventure/db/sql/create_lams_tool_eadventure.sql (.../create_lams_tool_eadventure.sql) (revision 7322054ababd8f5387c3424cdd38d99c3ab49e02) +++ lams_tool_eadventure/db/sql/create_lams_tool_eadventure.sql (.../create_lams_tool_eadventure.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -17,7 +17,7 @@ create_date datetime, eadventure_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_eueadv10_eadventure ( uid bigint not null auto_increment, create_date datetime, @@ -44,7 +44,7 @@ complete tinyint, define_complete tinyint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_eueadv10_session ( uid bigint not null auto_increment, session_end_date datetime, @@ -54,7 +54,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_eueadv10_user ( uid bigint not null auto_increment, user_id bigint, @@ -65,7 +65,7 @@ session_uid bigint, eadventure_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_eueadv10_item_log ( uid bigint not null auto_increment, access_date datetime, @@ -74,30 +74,30 @@ complete tinyint, session_id bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_eueadv10_var ( uid bigint not null auto_increment, name varchar(255), type varchar(255), value text, visit_log_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_eueadv10_param ( uid bigint not null auto_increment, name varchar(255), type varchar(255), input tinyint, eadventure_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_eueadv10_condition ( uid bigint not null auto_increment, sequence_id integer, eadventure_uid bigint, name varchar(255), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_eueadv10_condition_expression ( uid bigint not null auto_increment, condition_uid bigint, @@ -108,7 +108,7 @@ sequence_id integer, next_op varchar(255), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; alter table tl_eueadv10_attachment add index FK_NEW_1226715514_1E7009430E79035 (eadventure_uid), add constraint FK_NEW_1226715514_1E7009430E79035 foreign key (eadventure_uid) references tl_eueadv10_eadventure (uid); alter table tl_eueadv10_eadventure add index FK_NEW_1226715514_89093BF758092FB (create_by), add constraint FK_NEW_1226715514_89093BF758092FB foreign key (create_by) references tl_eueadv10_user (uid); alter table tl_eueadv10_item_log add index FK_NEW_1226715514_693580A438BF8DFE (eadventure_item_uid), add constraint FK_NEW_1226715514_693580A438BF8DFE foreign key (eadventure_item_uid) references tl_eueadv10_eadventure (uid); Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql =================================================================== diff -u -r0762d2ed47bda6daf6a2ae4eca9b3409b7c3b3ea -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_forum/db/sql/create_lams_tool_forum.sql (.../create_lams_tool_forum.sql) (revision 0762d2ed47bda6daf6a2ae4eca9b3409b7c3b3ea) +++ lams_tool_forum/db/sql/create_lams_tool_forum.sql (.../create_lams_tool_forum.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -20,7 +20,7 @@ forum_uid bigint, message_uid bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lafrum11_forum ( uid bigint not null auto_increment, create_date datetime, @@ -52,7 +52,7 @@ mark_release_notify tinyint DEFAULT 0, submission_deadline datetime, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lafrum11_forum_user ( uid bigint not null auto_increment, user_id bigint, @@ -62,7 +62,7 @@ login_name varchar(255), session_finished smallint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lafrum11_message ( uid bigint not null auto_increment, create_date datetime, @@ -83,21 +83,21 @@ report_id bigint, authored_parent_uid bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lafrum11_message_seq ( uid bigint not null auto_increment, root_message_uid bigint, message_uid bigint, message_level smallint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lafrum11_report ( uid bigint not null auto_increment, comment text, release_date datetime, mark float, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lafrum11_message_rating ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , rating float @@ -110,7 +110,7 @@ , INDEX (message_id) , CONSTRAINT FK_tl_lafrum11_message_rating_2 FOREIGN KEY (message_id) REFERENCES tl_lafrum11_message (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lafrum11_tool_session ( uid bigint not null auto_increment, version integer not null, @@ -122,7 +122,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lafrum11_conditions ( condition_id BIGINT(20) NOT NULL , content_uid BIGINT(20) @@ -131,7 +131,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ForumConditionToForum FOREIGN KEY (content_uid) REFERENCES tl_lafrum11_forum(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lafrum11_condition_topics ( condition_id BIGINT(20) @@ -141,7 +141,7 @@ REFERENCES tl_lafrum11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ForumConditionQuestionToForumQuestion FOREIGN KEY (topic_uid) REFERENCES tl_lafrum11_message(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lafrum11_timestamp ( uid BIGINT(20) not null auto_increment, message_uid BIGINT(20) not null, @@ -151,7 +151,7 @@ unique key `uid` (`uid`), key `message_uid` (`message_uid`), key `forum_user_uid` (`forum_user_uid`) -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_lafrum11_attachment add index FK389AD9A2FE939F2A (message_uid), add constraint FK389AD9A2FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid); alter table tl_lafrum11_attachment add index FK389AD9A2131CE31E (forum_uid), add constraint FK389AD9A2131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql (.../patch20081022_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081022_updateFrom21.sql (.../patch20081022_updateFrom21.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -13,7 +13,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ForumConditionToForum FOREIGN KEY (content_uid) REFERENCES tl_lafrum11_forum(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lafrum11_condition_topics ( condition_id BIGINT(20) @@ -23,7 +23,7 @@ REFERENCES tl_lafrum11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT ForumConditionQuestionToForumQuestion FOREIGN KEY (topic_uid) REFERENCES tl_lafrum11_message(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; ALTER TABLE tl_lafrum11_forum ADD COLUMN mark_release_notify tinyint DEFAULT 0; ----------------------Put all sql statements above here------------------------- Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql (.../patch20081118_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20081118_updateFrom22.sql (.../patch20081118_updateFrom22.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -17,7 +17,7 @@ unique key `uid` (`uid`), key `message_uid` (`message_uid`), key `forum_user_uid` (`forum_user_uid`) -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_lafrum11_timestamp add index ForumUserFK (forum_user_uid), add constraint ForumUserFK foreign key (forum_user_uid) references tl_lafrum11_forum_user (uid); alter table tl_lafrum11_timestamp add index MessageFK (message_uid), add constraint MessageFK foreign key (message_uid) references tl_lafrum11_message (uid); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20110228_updateTo236.sql =================================================================== diff -u -r8aad17797da49be7c1c7c9cbdf3919f8d6bef2eb -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20110228_updateTo236.sql (.../patch20110228_updateTo236.sql) (revision 8aad17797da49be7c1c7c9cbdf3919f8d6bef2eb) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20110228_updateTo236.sql (.../patch20110228_updateTo236.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -20,7 +20,7 @@ , INDEX (message_id) , CONSTRAINT FK_tl_lafrum11_message_rating_2 FOREIGN KEY (message_id) REFERENCES tl_lafrum11_message (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; UPDATE lams_tool SET tool_version = "20110228" WHERE tool_signature = "lafrum11"; Index: lams_tool_gmap/db/sql/create_lams_tool_gmap.sql =================================================================== diff -u -rb0ed30381e06d3ab769d6a01a8c9a518bd5b8a2b -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql (.../create_lams_tool_gmap.sql) (revision b0ed30381e06d3ab769d6a01a8c9a518bd5b8a2b) +++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql (.../create_lams_tool_gmap.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -7,12 +7,12 @@ drop table if exists tl_lagmap10_session; drop table if exists tl_lagmap10_user; drop table if exists tl_lagmap10_configuration; -create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), reflect_on_activity bit, reflect_instructions text, default_geocoder_address varchar(255), primary key (uid))TYPE=InnoDB; -create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, gmap_session_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_lagmap10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB; +create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), reflect_on_activity bit, reflect_instructions text, default_geocoder_address varchar(255), primary key (uid))ENGINE=InnoDB; +create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message text, create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, title varchar(55), created_by bigint, updated_by bigint, gmap_session_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lagmap10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))ENGINE=InnoDB; alter table tl_lagmap10_attachment add index FKBA2ECCB274028C80 (gmap_uid), add constraint FKBA2ECCB274028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid); alter table tl_lagmap10_marker add index FK10F2274974028C80 (gmap_uid), add constraint FK10F2274974028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid); alter table tl_lagmap10_marker add index FK10F22749C5F056D9 (gmap_session_uid), add constraint FK10F22749C5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid); Index: lams_tool_images/db/sql/create_lams_tool_imageGallery.sql =================================================================== diff -u -rdc714a9663a4868829c99d48bd763221b1343142 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision dc714a9663a4868829c99d48bd763221b1343142) +++ lams_tool_images/db/sql/create_lams_tool_imageGallery.sql (.../create_lams_tool_imageGallery.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -19,7 +19,7 @@ create_date datetime, imageGallery_uid bigint, primary key (attachment_uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimag10_imageGallery ( uid bigint not null auto_increment, create_date datetime, @@ -43,7 +43,7 @@ allow_rank tinyint, image_submit_notify tinyint DEFAULT 0, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimag10_imageGallery_item ( uid bigint not null auto_increment, description text, @@ -65,29 +65,29 @@ file_type varchar(255), file_name varchar(255), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimag10_image_comment ( uid bigint not null auto_increment, comment text, imageGallery_item_uid bigint, create_by bigint, create_date datetime, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_laimag10_image_rating ( uid bigint not null auto_increment, rating integer, imageGallery_item_uid bigint, create_by bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_laimag10_image_vote ( uid bigint not null auto_increment, is_voted tinyint, imageGallery_item_uid bigint, create_by bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_laimag10_item_log ( uid bigint not null auto_increment, access_date datetime, @@ -96,7 +96,7 @@ complete tinyint, session_id bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimag10_session ( uid bigint not null auto_increment, session_end_date datetime, @@ -106,7 +106,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimag10_user ( uid bigint not null auto_increment, user_id bigint, @@ -117,13 +117,13 @@ session_uid bigint, imageGallery_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimag10_configuration ( uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_laimag10_attachment add index FK_NEW_1821149711_1E7009430E79035 (imageGallery_uid), add constraint FK_NEW_1821149711_1E7009430E79035 foreign key (imageGallery_uid) references tl_laimag10_imageGallery (uid); alter table tl_laimag10_imageGallery add index FK_NEW_1821149711_89093BF758092FB (create_by), add constraint FK_NEW_1821149711_89093BF758092FB foreign key (create_by) references tl_laimag10_user (uid); Index: lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql (.../create_lams_tool_commonCartridge.sql) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/db/sql/create_lams_tool_commonCartridge.sql (.../create_lams_tool_commonCartridge.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -17,14 +17,14 @@ create_date datetime, commonCartridge_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimsc11_item_instruction ( uid bigint not null auto_increment, description varchar(255), sequence_id integer, item_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimsc11_commonCartridge ( uid bigint not null auto_increment, create_date datetime, @@ -44,7 +44,7 @@ reflect_instructions varchar(255), reflect_on_activity smallint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimsc11_commonCartridge_item ( uid bigint not null auto_increment, file_uuid bigint, @@ -73,7 +73,7 @@ commonCartridge_uid bigint, session_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimsc11_item_log ( uid bigint not null auto_increment, access_date datetime, @@ -82,7 +82,7 @@ complete tinyint, session_id bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimsc11_session ( uid bigint not null auto_increment, session_end_date datetime, @@ -92,7 +92,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimsc11_user ( uid bigint not null auto_increment, user_id bigint, @@ -103,13 +103,13 @@ session_uid bigint, commonCartridge_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_laimsc11_configuration ( uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_laimsc11_attachment add index FK_NEW_1279208528_1E7009430E79035 (commonCartridge_uid), add constraint FK_NEW_1279208528_1E7009430E79035 foreign key (commonCartridge_uid) references tl_laimsc11_commonCartridge (uid); alter table tl_laimsc11_item_instruction add index FK_NEW_1279208528_A5665013980570ED (item_uid), add constraint FK_NEW_1279208528_A5665013980570ED foreign key (item_uid) references tl_laimsc11_commonCartridge_item (uid); Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql =================================================================== diff -u -r3e5b36454b17cee648f9d02e0656e8e99c46e00e -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision 3e5b36454b17cee648f9d02e0656e8e99c46e00e) +++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql (.../create_lams_tool_mc.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -23,7 +23,7 @@ , submission_deadline datetime DEFAULT NULL , UNIQUE UQ_tl_lamc11_content_1 (content_id) , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lamc11_que_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -36,7 +36,7 @@ , INDEX (mc_content_id) , CONSTRAINT FK_tl_lamc11_que_content_1 FOREIGN KEY (mc_content_id) REFERENCES tl_lamc11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lamc11_options_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -48,7 +48,7 @@ , INDEX (mc_que_content_id) , CONSTRAINT FK_tl_lamc11_options_content_1 FOREIGN KEY (mc_que_content_id) REFERENCES tl_lamc11_que_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lamc11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -63,7 +63,7 @@ , INDEX (mc_content_id) , CONSTRAINT FK_tl_lamc_session_1 FOREIGN KEY (mc_content_id) REFERENCES tl_lamc11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lamc11_que_usr ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -79,7 +79,7 @@ , INDEX (mc_session_id) , CONSTRAINT FK_tl_lamc11_que_usr_1 FOREIGN KEY (mc_session_id) REFERENCES tl_lamc11_session (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lamc11_usr_attempt ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -102,7 +102,7 @@ , INDEX (que_usr_id) , CONSTRAINT FK_tl_lamc11_usr_attempt_4 FOREIGN KEY (que_usr_id) REFERENCES tl_lamc11_que_usr (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lamc11_uploadedfile ( submissionId BIGINT(20) NOT NULL AUTO_INCREMENT @@ -114,7 +114,7 @@ , INDEX (mc_content_id) , CONSTRAINT FK_tl_lamc11_uploadedFile FOREIGN KEY (mc_content_id) REFERENCES tl_lamc11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; INSERT INTO tl_lamc11_content(uid, content_id , title, instructions, creation_date , reflect, questions_sequenced , created_by , run_offline , define_later, offline_instructions, online_instructions, content_in_use, retries, show_report, pass_mark) VALUES (1, ${default_content_id} , 'MCQ', 'Instructions', NOW(), 0, 0, 1, 0, 0, '','', 0, 0, 0, 0); Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql =================================================================== diff -u -rcd0b7b82232971e95d54348b03049beb1dfe0ecb -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision cd0b7b82232971e95d54348b03049beb1dfe0ecb) +++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql (.../create_lams_tool_qa.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -22,7 +22,7 @@ , showOtherAnswers TINYINT(1) NOT NULL DEFAULT 1 , allow_rich_editor TINYINT(1) NOT NULL DEFAULT 0 , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -36,7 +36,7 @@ , INDEX (qa_content_id) , CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (qa_content_id) REFERENCES tl_laqa11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_que_usr ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -50,7 +50,7 @@ , INDEX (qa_session_id) , CONSTRAINT FK_tl_laqa11_que_usr_1 FOREIGN KEY (qa_session_id) REFERENCES tl_laqa11_session (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_que_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -63,7 +63,7 @@ , INDEX (qa_content_id) , CONSTRAINT FK_tl_laqa11_que_content_1 FOREIGN KEY (qa_content_id) REFERENCES tl_laqa11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_usr_resp ( response_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -80,7 +80,7 @@ , INDEX (qa_que_content_id) , CONSTRAINT FK_tl_laqa11_usr_resp_2 FOREIGN KEY (qa_que_content_id) REFERENCES tl_laqa11_que_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_response_rating ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -94,7 +94,7 @@ , INDEX (response_id) , CONSTRAINT FK_tl_laqa11_response_rating_2 FOREIGN KEY (response_id) REFERENCES tl_laqa11_usr_resp (response_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_uploadedfile ( submissionId BIGINT(20) NOT NULL AUTO_INCREMENT @@ -106,7 +106,7 @@ , INDEX (qa_content_id) , CONSTRAINT FK_tl_laqa11_uploadedfile_1 FOREIGN KEY (qa_content_id) REFERENCES tl_laqa11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_conditions ( condition_id BIGINT(20) NOT NULL @@ -116,7 +116,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT QaConditionToQaContent FOREIGN KEY (content_uid) REFERENCES tl_laqa11_content(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_condition_questions ( condition_id BIGINT(20) @@ -126,7 +126,7 @@ REFERENCES tl_laqa11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT QaConditionQuestionToQaQuestion FOREIGN KEY (question_uid) REFERENCES tl_laqa11_que_content(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; -- data for content table INSERT INTO tl_laqa11_content (qa_content_id, title, instructions, creation_date, lockWhenFinished) VALUES (${default_content_id}, 'Q&A', 'Instructions', NOW() , 0); @@ -140,10 +140,10 @@ drop table if exists tl_laqa11_wizard_category; drop table if exists tl_laqa11_wizard_cognitive_skill; drop table if exists tl_laqa11_wizard_question; -create table tl_laqa11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB; -create table tl_laqa11_wizard_category (uid bigint not null auto_increment, title varchar(255) not null, primary key (uid))TYPE=InnoDB; -create table tl_laqa11_wizard_cognitive_skill (uid bigint not null auto_increment, title varchar(255) not null, category_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_laqa11_wizard_question (uid bigint not null auto_increment, cognitive_skill_uid bigint, title text not null, primary key (uid))TYPE=InnoDB; +create table tl_laqa11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))ENGINE=InnoDB; +create table tl_laqa11_wizard_category (uid bigint not null auto_increment, title varchar(255) not null, primary key (uid))ENGINE=InnoDB; +create table tl_laqa11_wizard_cognitive_skill (uid bigint not null auto_increment, title varchar(255) not null, category_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_laqa11_wizard_question (uid bigint not null auto_increment, cognitive_skill_uid bigint, title text not null, primary key (uid))ENGINE=InnoDB; alter table tl_laqa11_wizard_cognitive_skill add index FK3BA4132BCBB0DC8D (category_uid), add constraint FK3BA4132BCBB0DC8D foreign key (category_uid) references tl_laqa11_wizard_category (uid); alter table tl_laqa11_wizard_question add index FKAF08A0C7EFF77FD4 (cognitive_skill_uid), add constraint FKAF08A0C7EFF77FD4 foreign key (cognitive_skill_uid) references tl_laqa11_wizard_cognitive_skill (uid); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20080926_updateFrom21.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20080926_updateFrom21.sql (.../patch20080926_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20080926_updateFrom21.sql (.../patch20080926_updateFrom21.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -15,7 +15,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT QaConditionToQaContent FOREIGN KEY (content_uid) REFERENCES tl_laqa11_content(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_laqa11_condition_questions ( condition_id BIGINT(20) @@ -25,7 +25,7 @@ REFERENCES tl_laqa11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT QaConditionQuestionToQaQuestion FOREIGN KEY (question_uid) REFERENCES tl_laqa11_que_content(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='laqa11'; @@ -35,10 +35,10 @@ SET FOREIGN_KEY_CHECKS=0; -- insert scripts for the wizard tables -create table tl_laqa11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))TYPE=InnoDB; -create table tl_laqa11_wizard_category (uid bigint not null auto_increment, title varchar(255) not null, primary key (uid))TYPE=InnoDB; -create table tl_laqa11_wizard_cognitive_skill (uid bigint not null auto_increment, title varchar(255) not null, category_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_laqa11_wizard_question (uid bigint not null auto_increment, cognitive_skill_uid bigint, title text not null, primary key (uid))TYPE=InnoDB; +create table tl_laqa11_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value varchar(255), primary key (uid))ENGINE=InnoDB; +create table tl_laqa11_wizard_category (uid bigint not null auto_increment, title varchar(255) not null, primary key (uid))ENGINE=InnoDB; +create table tl_laqa11_wizard_cognitive_skill (uid bigint not null auto_increment, title varchar(255) not null, category_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_laqa11_wizard_question (uid bigint not null auto_increment, cognitive_skill_uid bigint, title text not null, primary key (uid))ENGINE=InnoDB; alter table tl_laqa11_wizard_cognitive_skill add index FK3BA4132BCBB0DC8D (category_uid), add constraint FK3BA4132BCBB0DC8D foreign key (category_uid) references tl_laqa11_wizard_category (uid); alter table tl_laqa11_wizard_question add index FKAF08A0C7EFF77FD4 (cognitive_skill_uid), add constraint FKAF08A0C7EFF77FD4 foreign key (cognitive_skill_uid) references tl_laqa11_wizard_cognitive_skill (uid); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql =================================================================== diff -u -r88ac6897c5fcfc58c7d0691d5b1ec9868bbe92a1 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql (.../patch20110217_updateTo236.sql) (revision 88ac6897c5fcfc58c7d0691d5b1ec9868bbe92a1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20110217_updateTo236.sql (.../patch20110217_updateTo236.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -20,7 +20,7 @@ , INDEX (response_id) , CONSTRAINT FK_tl_laqa11_response_rating_2 FOREIGN KEY (response_id) REFERENCES tl_laqa11_usr_resp (response_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; -- LDEV-2653 autosave feature ALTER TABLE tl_laqa11_usr_resp DROP COLUMN hidden; Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql =================================================================== diff -u -r1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8) +++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -15,14 +15,14 @@ create_date datetime, resource_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_larsrc11_item_instruction ( uid bigint not null auto_increment, description varchar(255), sequence_id integer, item_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_larsrc11_resource ( uid bigint not null auto_increment, create_date datetime, @@ -45,7 +45,7 @@ reflect_on_activity smallint, assigment_submit_notify tinyint DEFAULT 0, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_larsrc11_resource_item ( uid bigint not null auto_increment, file_uuid bigint, @@ -68,7 +68,7 @@ session_uid bigint, order_id integer, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_larsrc11_item_log ( uid bigint not null auto_increment, access_date datetime, @@ -78,7 +78,7 @@ complete tinyint, session_id bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_larsrc11_session ( uid bigint not null auto_increment, session_end_date datetime, @@ -88,7 +88,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_larsrc11_user ( uid bigint not null auto_increment, user_id bigint, @@ -99,7 +99,7 @@ session_uid bigint, resource_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; alter table tl_larsrc11_attachment add index FK1E7009430E79035 (resource_uid), add constraint FK1E7009430E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid); alter table tl_larsrc11_item_instruction add index FKA5665013980570ED (item_uid), add constraint FKA5665013980570ED foreign key (item_uid) references tl_larsrc11_resource_item (uid); alter table tl_larsrc11_resource add index FK89093BF758092FB (create_by), add constraint FK89093BF758092FB foreign key (create_by) references tl_larsrc11_user (uid); Index: lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql =================================================================== diff -u -r79d80d58b415dfbead2011e4f1701a338b613b11 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql (.../create_lams_tool_mindmap.sql) (revision 79d80d58b415dfbead2011e4f1701a338b613b11) +++ lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql (.../create_lams_tool_mindmap.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -8,11 +8,11 @@ drop table if exists tl_lamind10_node; drop table if exists tl_lamind10_request; -create table tl_lamind10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, mindmap_uid bigint, primary key (uid))type=innodb; -create table tl_lamind10_mindmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, submission_deadline datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, multiuser_mode bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, export_content text, reflect_on_activity bit, reflect_instructions text, primary key (uid))type=innodb; -create table tl_lamind10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), mindmap_uid bigint, primary key (uid))type=innodb; -create table tl_lamind10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, mindmap_session_uid bigint, entry_uid bigint, primary key (uid))type=innodb; -create table tl_lamind10_node (node_id bigint not null auto_increment, unique_id bigint, parent_id bigint, node_text varchar(100), node_color varchar(6), session_id bigint, user_id bigint, mindmap_id bigint, primary key (node_id))TYPE=InnoDB; +create table tl_lamind10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, mindmap_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lamind10_mindmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, submission_deadline datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, multiuser_mode bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, export_content text, reflect_on_activity bit, reflect_instructions text, primary key (uid))ENGINE=InnoDB; +create table tl_lamind10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), mindmap_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lamind10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, mindmap_session_uid bigint, entry_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lamind10_node (node_id bigint not null auto_increment, unique_id bigint, parent_id bigint, node_text varchar(100), node_color varchar(6), session_id bigint, user_id bigint, mindmap_id bigint, primary key (node_id))ENGINE=InnoDB; CREATE TABLE tl_lamind10_request (`uid` BIGINT(20) NOT NULL AUTO_INCREMENT, `unique_id` BIGINT(20) DEFAULT NULL, `global_id` BIGINT(20) DEFAULT NULL, `request_type` TINYINT(4) DEFAULT NULL, `node_id` BIGINT(20) DEFAULT NULL, `node_child_id` BIGINT(20) DEFAULT NULL, `user_id` BIGINT(20) DEFAULT NULL, `mindmap_id` BIGINT(20) DEFAULT NULL, PRIMARY KEY (`uid`), KEY `mindmap_id` (`mindmap_id`), KEY `user_id` (`user_id`), CONSTRAINT `tl_lamind10_request_fk` FOREIGN KEY (`mindmap_id`) REFERENCES `tl_lamind10_mindmap` (`uid`), CONSTRAINT `tl_lamind10_request_fk1` FOREIGN KEY (`user_id`) REFERENCES `tl_lamind10_user` (`uid`))ENGINE=InnoDB; alter table tl_lamind10_attachment add index FK_NEW_972920762_12090F57FC940906 (mindmap_uid), add constraint FK_NEW_972920762_12090F57FC940906 foreign key (mindmap_uid) references tl_lamind10_mindmap (uid); Index: lams_tool_nb/db/sql/create_lams_tool_nb.sql =================================================================== diff -u -r89b6e076006b36f7edcf712cfa97b87ef9010e23 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_nb/db/sql/create_lams_tool_nb.sql (.../create_lams_tool_nb.sql) (revision 89b6e076006b36f7edcf712cfa97b87ef9010e23) +++ lams_tool_nb/db/sql/create_lams_tool_nb.sql (.../create_lams_tool_nb.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -16,7 +16,7 @@ , date_created DATETIME , date_updated DATETIME , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lanb11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -30,7 +30,7 @@ , INDEX (nb_content_uid) , CONSTRAINT FK_tl_lanb11_session_1 FOREIGN KEY (nb_content_uid) REFERENCES tl_lanb11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lanb11_user ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -43,7 +43,7 @@ , INDEX (nb_session_uid) , CONSTRAINT FK_tl_lanb11_user_1 FOREIGN KEY (nb_session_uid) REFERENCES tl_lanb11_session (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lanb11_attachment ( @@ -57,7 +57,7 @@ , INDEX (nb_content_uid) , CONSTRAINT FK_tl_lanb11_attachment_1 FOREIGN KEY (nb_content_uid) REFERENCES tl_lanb11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; -- Default Content For Noticeboard Tool Index: lams_tool_nb/db/sql/init_lams_tool_nb.sql =================================================================== diff -u -r89b6e076006b36f7edcf712cfa97b87ef9010e23 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_nb/db/sql/init_lams_tool_nb.sql (.../init_lams_tool_nb.sql) (revision 89b6e076006b36f7edcf712cfa97b87ef9010e23) +++ lams_tool_nb/db/sql/init_lams_tool_nb.sql (.../init_lams_tool_nb.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -21,7 +21,7 @@ , date_created DATETIME , date_updated DATETIME , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lanb11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -34,7 +34,7 @@ , INDEX (nb_content_uid) , CONSTRAINT FK_tl_lanb11_session_1 FOREIGN KEY (nb_content_uid) REFERENCES lams.tl_lanb11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lanb11_user ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -47,7 +47,7 @@ , INDEX (nb_session_uid) , CONSTRAINT FK_tl_lanb11_user_1 FOREIGN KEY (nb_session_uid) REFERENCES lams.tl_lanb11_session (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lanb11_attachment ( attachment_id BIGINT(20) NOT NULL AUTO_INCREMENT @@ -60,4 +60,4 @@ , INDEX (nb_content_uid) , CONSTRAINT FK_tl_lanb11_attachment_1 FOREIGN KEY (nb_content_uid) REFERENCES lams.tl_lanb11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; Index: lams_tool_nb/db/sql/test_data_lams_tool_nb.sql =================================================================== diff -u -r0020142e02f5cd9631e5602a538189b8077350ef -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_nb/db/sql/test_data_lams_tool_nb.sql (.../test_data_lams_tool_nb.sql) (revision 0020142e02f5cd9631e5602a538189b8077350ef) +++ lams_tool_nb/db/sql/test_data_lams_tool_nb.sql (.../test_data_lams_tool_nb.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -14,7 +14,7 @@ , date_created DATETIME , date_updated DATETIME , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams.tl_lanb11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -27,7 +27,7 @@ , INDEX (nb_content_uid) , CONSTRAINT FK_tl_lanb11_session_1 FOREIGN KEY (nb_content_uid) REFERENCES lams.tl_lanb11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams.tl_lanb11_user ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -40,7 +40,7 @@ , INDEX (nb_session_uid) , CONSTRAINT FK_tl_lanb11_user_1 FOREIGN KEY (nb_session_uid) REFERENCES lams.tl_lanb11_session (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE lams.tl_lanb11_attachment ( @@ -54,5 +54,5 @@ , INDEX (nb_content_uid) , CONSTRAINT FK_tl_lanb11_attachment_1 FOREIGN KEY (nb_content_uid) REFERENCES lams.tl_lanb11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; Index: lams_tool_notebook/db/sql/create_lams_tool_notebook.sql =================================================================== diff -u -r2c2e9dc9833eff48165e8b5e830d399d546c60df -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_notebook/db/sql/create_lams_tool_notebook.sql (.../create_lams_tool_notebook.sql) (revision 2c2e9dc9833eff48165e8b5e830d399d546c60df) +++ lams_tool_notebook/db/sql/create_lams_tool_notebook.sql (.../create_lams_tool_notebook.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -6,10 +6,10 @@ drop table if exists tl_lantbk11_notebook; drop table if exists tl_lantbk11_session; drop table if exists tl_lantbk11_user; -create table tl_lantbk11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, notebook_uid bigint, primary key (uid))type=innodb; -create table tl_lantbk11_notebook (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, submission_deadline datetime DEFAULT NULL, primary key (uid))type=innodb; -create table tl_lantbk11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), notebook_uid bigint, primary key (uid))type=innodb; -create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, entry_uid bigint, primary key (uid))type=innodb; +create table tl_lantbk11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, notebook_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lantbk11_notebook (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, submission_deadline datetime DEFAULT NULL, primary key (uid))ENGINE=InnoDB; +create table tl_lantbk11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), notebook_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, entry_uid bigint, primary key (uid))ENGINE=InnoDB; alter table tl_lantbk11_attachment add index FK12090F57FC940906 (notebook_uid), add constraint FK12090F57FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid); alter table tl_lantbk11_session add index FKB7C198E2FC940906 (notebook_uid), add constraint FKB7C198E2FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid); alter table tl_lantbk11_user add index FKCB8A58FFA3B0FADF (notebook_session_uid), add constraint FKCB8A58FFA3B0FADF foreign key (notebook_session_uid) references tl_lantbk11_session (uid); @@ -46,6 +46,6 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT NotebookConditionToNotebook FOREIGN KEY (content_uid) REFERENCES tl_lantbk11_notebook(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql (.../patch20080929_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql (.../patch20080929_updateFrom21.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -13,7 +13,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT NotebookConditionToNotebook FOREIGN KEY (content_uid) REFERENCES tl_lantbk11_notebook(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lantbk11'; Index: lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql =================================================================== diff -u -rf31b75c40cca57454726c6f43dfba57cc2dae37c -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql (.../create_lams_tool_pixlr.sql) (revision f31b75c40cca57454726c6f43dfba57cc2dae37c) +++ lams_tool_pixlr/db/sql/create_lams_tool_pixlr.sql (.../create_lams_tool_pixlr.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -6,11 +6,11 @@ drop table if exists tl_lapixl10_session; drop table if exists tl_lapixl10_user; drop table if exists tl_lapixl10_configuration; -create table tl_lapixl10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, pixlr_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_lapixl10_pixlr (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, allow_view_others_images bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, image_file_name text, image_width bigint, image_height bigint, reflect_instructions text, primary key (uid))TYPE=InnoDB; -create table tl_lapixl10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), pixlr_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_lapixl10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, pixlr_session_uid bigint, entry_uid bigint, image_file_name text, imageHeight bigint, imageWidth bigint, imageHidden bit, primary key (uid))TYPE=InnoDB; -create table tl_lapixl10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value text, primary key (uid))TYPE=InnoDB; +create table tl_lapixl10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, pixlr_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lapixl10_pixlr (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, allow_view_others_images bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, image_file_name text, image_width bigint, image_height bigint, reflect_instructions text, primary key (uid))ENGINE=InnoDB; +create table tl_lapixl10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), pixlr_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lapixl10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, pixlr_session_uid bigint, entry_uid bigint, image_file_name text, imageHeight bigint, imageWidth bigint, imageHidden bit, primary key (uid))ENGINE=InnoDB; +create table tl_lapixl10_configuration (uid bigint not null auto_increment, config_key varchar(30) unique, config_value text, primary key (uid))ENGINE=InnoDB; alter table tl_lapixl10_attachment add index FK951F889ACB8ADA74 (pixlr_uid), add constraint FK951F889ACB8ADA74 foreign key (pixlr_uid) references tl_lapixl10_pixlr (uid); alter table tl_lapixl10_session add index FKE5C05E7FCB8ADA74 (pixlr_uid), add constraint FKE5C05E7FCB8ADA74 foreign key (pixlr_uid) references tl_lapixl10_pixlr (uid); alter table tl_lapixl10_user add index FK9A39C08236E23005 (pixlr_session_uid), add constraint FK9A39C08236E23005 foreign key (pixlr_session_uid) references tl_lapixl10_session (uid); Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql =================================================================== diff -u -reab46de044a4c899fb8c8759c375402c6dba8783 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql (.../create_lams_tool_sbmt.sql) (revision eab46de044a4c899fb8c8759c375402c6dba8783) +++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql (.../create_lams_tool_sbmt.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -28,7 +28,7 @@ mark_release_notify tinyint DEFAULT 0, file_submit_notify tinyint DEFAULT 0, primary key (content_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lasbmt11_user ( uid bigint not null auto_increment, user_id integer, @@ -39,7 +39,7 @@ last_name varchar(255), content_id bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lasbmt11_instruction_files ( uid bigint not null auto_increment, @@ -49,7 +49,7 @@ name varchar(255), content_id bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lasbmt11_report ( report_id bigint not null auto_increment, comments text, @@ -59,14 +59,14 @@ mark_file_version_id bigint, mark_file_name varchar(255), primary key (report_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lasbmt11_session ( session_id bigint not null, status integer not null, content_id bigint, session_name varchar(250), primary key (session_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lasbmt11_submission_details ( submission_id bigint not null auto_increment, filePath varchar(250), @@ -77,7 +77,7 @@ session_id bigint, learner_id bigint, primary key (submission_id) -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_lasbmt11_content add index FKAEF329AC172BC670 (created_by), add constraint FKAEF329AC172BC670 foreign key (created_by) references tl_lasbmt11_user (uid); alter table tl_lasbmt11_instruction_files add index FKA75538F9785A173A (content_id), add constraint FKA75538F9785A173A foreign key (content_id) references tl_lasbmt11_content (content_id); Index: lams_tool_scribe/db/sql/create_lams_tool_scribe.sql =================================================================== diff -u -r98f10c35c8f290b7f3bcea1908f22cd77e7e8943 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_scribe/db/sql/create_lams_tool_scribe.sql (.../create_lams_tool_scribe.sql) (revision 98f10c35c8f290b7f3bcea1908f22cd77e7e8943) +++ lams_tool_scribe/db/sql/create_lams_tool_scribe.sql (.../create_lams_tool_scribe.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -7,12 +7,12 @@ drop table if exists tl_lascrb11_scribe; drop table if exists tl_lascrb11_session; drop table if exists tl_lascrb11_user; -create table tl_lascrb11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, scribe_uid bigint, primary key (uid))type=innodb; -create table tl_lascrb11_heading (uid bigint not null auto_increment, heading text, scribe_uid bigint, display_order integer, primary key (uid))type=innodb; -create table tl_lascrb11_report_entry (uid bigint not null auto_increment, entry_text text, scribe_heading_uid bigint, scribe_session_uid bigint, primary key (uid))type=innodb; -create table tl_lascrb11_scribe (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, auto_select_scribe bit, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, aggregated_reports bit default 0, primary key (uid))type=innodb; -create table tl_lascrb11_session (uid bigint not null auto_increment, version integer not null, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), scribe_uid bigint, appointed_scribe_uid bigint, force_complete bit, report_submitted bit, primary key (uid))type=innodb; -create table tl_lascrb11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, scribe_session_uid bigint, report_approved bit, started_activity bit, primary key (uid))type=innodb; +create table tl_lascrb11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, scribe_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lascrb11_heading (uid bigint not null auto_increment, heading text, scribe_uid bigint, display_order integer, primary key (uid))ENGINE=InnoDB; +create table tl_lascrb11_report_entry (uid bigint not null auto_increment, entry_text text, scribe_heading_uid bigint, scribe_session_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lascrb11_scribe (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, auto_select_scribe bit, reflect_on_activity bit, reflect_instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, aggregated_reports bit default 0, primary key (uid))ENGINE=InnoDB; +create table tl_lascrb11_session (uid bigint not null auto_increment, version integer not null, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), scribe_uid bigint, appointed_scribe_uid bigint, force_complete bit, report_submitted bit, primary key (uid))ENGINE=InnoDB; +create table tl_lascrb11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, scribe_session_uid bigint, report_approved bit, started_activity bit, primary key (uid))ENGINE=InnoDB; alter table tl_lascrb11_attachment add index FK57953706B3FA1495 (scribe_uid), add constraint FK57953706B3FA1495 foreign key (scribe_uid) references tl_lascrb11_scribe (uid); alter table tl_lascrb11_heading add index FK428A22FFB3FA1495 (scribe_uid), add constraint FK428A22FFB3FA1495 foreign key (scribe_uid) references tl_lascrb11_scribe (uid); alter table tl_lascrb11_report_entry add index FK5439FACAEA50D086 (scribe_heading_uid), add constraint FK5439FACAEA50D086 foreign key (scribe_heading_uid) references tl_lascrb11_heading (uid); Index: lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql =================================================================== diff -u -ra7fed1be51941ace379dbb695d52bd08a315dae6 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql (.../create_lams_tool_spreadsheet.sql) (revision a7fed1be51941ace379dbb695d52bd08a315dae6) +++ lams_tool_spreadsheet/db/sql/create_lams_tool_spreadsheet.sql (.../create_lams_tool_spreadsheet.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -13,7 +13,7 @@ create_date datetime, spreadsheet_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasprd10_spreadsheet ( uid bigint not null auto_increment, create_date datetime, @@ -34,20 +34,20 @@ reflect_instructions varchar(255), reflect_on_activity smallint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasprd10_user_modified_spreadsheet ( uid bigint not null auto_increment, user_modified_spreadsheet text, mark_id bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasprd10_spreadsheet_mark ( uid bigint not null auto_increment, marks varchar(255), comments text, date_marks_released datetime, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasprd10_session ( uid bigint not null auto_increment, session_end_date datetime, @@ -57,7 +57,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasprd10_user ( uid bigint not null auto_increment, user_id bigint, @@ -69,7 +69,7 @@ spreadsheet_uid bigint, user_modified_spreadsheet_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; alter table tl_lasprd10_attachment add index FK_NEW_2065267438_1E7009430E79035 (spreadsheet_uid), add constraint FK_NEW_2065267438_1E7009430E79035 foreign key (spreadsheet_uid) references tl_lasprd10_spreadsheet (uid); alter table tl_lasprd10_spreadsheet add index FK_NEW_2065267438_89093BF758092FB (create_by), add constraint FK_NEW_2065267438_89093BF758092FB foreign key (create_by) references tl_lasprd10_user (uid); alter table tl_lasprd10_session add index FK_NEW_2065267438_24AA78C530E79035 (spreadsheet_uid), add constraint FK_NEW_2065267438_24AA78C530E79035 foreign key (spreadsheet_uid) references tl_lasprd10_spreadsheet (uid); Index: lams_tool_survey/db/sql/create_lams_tool_survey.sql =================================================================== diff -u -rda3ab23df4afd600475db0e6f4886a0358f849aa -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_survey/db/sql/create_lams_tool_survey.sql (.../create_lams_tool_survey.sql) (revision da3ab23df4afd600475db0e6f4886a0358f849aa) +++ lams_tool_survey/db/sql/create_lams_tool_survey.sql (.../create_lams_tool_survey.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -28,7 +28,7 @@ create_by bigint, answer_submit_notify tinyint DEFAULT 0, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasurv11_answer ( @@ -39,7 +39,7 @@ udpate_date datetime, answer_text text, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasurv11_attachment ( uid bigint not null auto_increment, @@ -50,15 +50,15 @@ create_date datetime, survey_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasurv11_option ( uid bigint not null auto_increment, description text, sequence_id integer, question_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasurv11_question ( uid bigint not null auto_increment, @@ -72,7 +72,7 @@ allow_multiple_answer smallint, survey_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasurv11_session ( uid bigint not null auto_increment, @@ -82,7 +82,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lasurv11_user ( uid bigint not null auto_increment, @@ -94,7 +94,7 @@ survey_uid bigint, session_finished smallint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; CREATE TABLE tl_lasurv11_conditions ( condition_id BIGINT(20) NOT NULL @@ -104,7 +104,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT SurveyConditionToSurvey FOREIGN KEY (content_uid) REFERENCES tl_lasurv11_survey(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lasurv11_condition_questions ( condition_id BIGINT(20) @@ -114,7 +114,7 @@ REFERENCES tl_lasurv11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT SurveyConditionQuestionToSurveyQuestion FOREIGN KEY (question_uid) REFERENCES tl_lasurv11_question(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_lasurv11_answer add index FK6DAAFE3BB1423DC1 (user_uid), add constraint FK6DAAFE3BB1423DC1 foreign key (user_uid) references tl_lasurv11_user (uid); alter table tl_lasurv11_answer add index FK6DAAFE3B25F3BB77 (question_uid), add constraint FK6DAAFE3B25F3BB77 foreign key (question_uid) references tl_lasurv11_question (uid); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20081021_updateFrom21.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20081021_updateFrom21.sql (.../patch20081021_updateFrom21.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dbupdates/patch20081021_updateFrom21.sql (.../patch20081021_updateFrom21.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -13,7 +13,7 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT SurveyConditionToSurvey FOREIGN KEY (content_uid) REFERENCES tl_lasurv11_survey(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lasurv11_condition_questions ( condition_id BIGINT(20) @@ -23,7 +23,7 @@ REFERENCES tl_lasurv11_conditions(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT SurveyConditionQuestionToSurveyQuestion FOREIGN KEY (question_uid) REFERENCES tl_lasurv11_question(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; UPDATE lams_tool SET supports_outputs=1 WHERE tool_signature='lasurv11'; Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql =================================================================== diff -u -rc142236c124ecebfa9f29ea91c71759c579e1c61 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision c142236c124ecebfa9f29ea91c71759c579e1c61) +++ lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -18,19 +18,19 @@ create_date datetime, taskList_uid bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_condition ( condition_uid bigint not null auto_increment, sequence_id integer, taskList_uid bigint, name varchar(255), primary key (condition_uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_condition_tl_item ( uid bigint not null, condition_uid bigint not null, primary key (uid, condition_uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_taskList ( uid bigint not null auto_increment, create_date datetime, @@ -53,7 +53,7 @@ reflect_on_activity smallint, submission_deadline datetime DEFAULT NULL, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_taskList_item ( uid bigint not null auto_increment, sequence_id integer, @@ -76,7 +76,7 @@ taskList_uid bigint, session_uid bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_item_log ( uid bigint not null auto_increment, access_date datetime, @@ -85,7 +85,7 @@ complete tinyint, session_id bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_item_attachment ( uid bigint not null auto_increment, file_version_id bigint, @@ -96,15 +96,15 @@ taskList_item_uid bigint, create_by bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_item_comment ( uid bigint not null auto_increment, comment text, taskList_item_uid bigint, create_by bigint, create_date datetime, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_session ( uid bigint not null auto_increment, session_end_date datetime, @@ -114,7 +114,7 @@ session_id bigint, session_name varchar(250), primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_latask10_user ( uid bigint not null auto_increment, user_id bigint, @@ -126,7 +126,7 @@ taskList_uid bigint, is_verified_by_monitor tinyint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_latask10_attachment add index FK_NEW_174079138_1E7009430E79035 (taskList_uid), add constraint FK_NEW_174079138_1E7009430E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid); alter table tl_latask10_condition add index FK_tl_latask10_condition_1 (taskList_uid), add constraint FK_tl_latask10_condition_1 foreign key (taskList_uid) references tl_latask10_taskList (uid); alter table tl_latask10_condition_tl_item add index FK_tl_latask10_taskList_item_condition_1 (condition_uid), add constraint FK_tl_latask10_taskList_item_condition_1 foreign key (condition_uid) references tl_latask10_condition (condition_uid); Index: lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql =================================================================== diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql (.../create_lams_tool_videoRecorder.sql) (revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82) +++ lams_tool_videorecorder/db/sql/create_lams_tool_videoRecorder.sql (.../create_lams_tool_videoRecorder.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -19,7 +19,7 @@ create_date datetime, videoRecorder_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lavidr10_videoRecorder ( uid bigint not null auto_increment, @@ -47,7 +47,7 @@ export_offline bit, export_all bit, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lavidr10_session ( uid bigint not null auto_increment, @@ -58,7 +58,7 @@ videoRecorder_uid bigint, content_folder_id varchar(32), primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lavidr10_recording ( uid bigint not null auto_increment, @@ -74,7 +74,7 @@ is_just_sound bit, videoRecorder_session_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lavidr10_user ( uid bigint not null auto_increment, @@ -85,7 +85,7 @@ videoRecorder_session_uid bigint, entry_uid bigint, primary key (uid) -)type=innodb; +)ENGINE=InnoDB; create table tl_lavidr10_comment ( uid bigint not null auto_increment, @@ -95,7 +95,7 @@ create_by bigint, create_date datetime, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lavidr10_rating ( uid bigint not null auto_increment, @@ -105,7 +105,7 @@ create_by bigint, create_date datetime, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_lavidr10_attachment add index FK_NEW_75587508_12090F57FC940906 (videoRecorder_uid), add constraint FK_NEW_75587508_12090F57FC940906 foreign key (videoRecorder_uid) references tl_lavidr10_videoRecorder (uid); alter table tl_lavidr10_session add index FK_NEW_75587508_B7C198E2FC940906 (videoRecorder_uid), add constraint FK_NEW_75587508_B7C198E2FC940906 foreign key (videoRecorder_uid) references tl_lavidr10_videoRecorder (uid); @@ -161,6 +161,6 @@ REFERENCES lams_branch_condition(condition_id) ON DELETE CASCADE ON UPDATE CASCADE , CONSTRAINT VideoRecorderConditionToVideoRecorder FOREIGN KEY (content_uid) REFERENCES tl_lavidr10_videoRecorder(uid) ON DELETE CASCADE ON UPDATE CASCADE -)TYPE=InnoDB; +)ENGINE=InnoDB; SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql =================================================================== diff -u -r57a242c8553eeec5781c2106493aa9f34efa5489 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision 57a242c8553eeec5781c2106493aa9f34efa5489) +++ lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -24,7 +24,7 @@ , max_external_inputs SMALLINT , submission_deadline datetime DEFAULT NULL , PRIMARY KEY (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lavote11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -39,7 +39,7 @@ , INDEX (vote_content_id) , CONSTRAINT FK_tl_lavote11_session_1 FOREIGN KEY (vote_content_id) REFERENCES tl_lavote11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lavote11_usr ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -53,7 +53,7 @@ , INDEX (vote_session_id) , CONSTRAINT FK_tl_lavote11_usr_1 FOREIGN KEY (vote_session_id) REFERENCES tl_lavote11_session (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lavote11_nomination_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -64,7 +64,7 @@ , INDEX (vote_content_id) , CONSTRAINT FK_tl_lavote11_nomination_content_1 FOREIGN KEY (vote_content_id) REFERENCES tl_lavote11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lavote11_usr_attempt ( uid BIGINT(20) NOT NULL AUTO_INCREMENT @@ -82,7 +82,7 @@ , INDEX (vote_nomination_content_id) , CONSTRAINT FK_tl_lavote11_usr_attempt_3 FOREIGN KEY (vote_nomination_content_id) REFERENCES tl_lavote11_nomination_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; CREATE TABLE tl_lavote11_uploadedfile ( submissionId BIGINT(20) NOT NULL AUTO_INCREMENT @@ -94,7 +94,7 @@ , INDEX (vote_content_id) , CONSTRAINT FK_tablex_111 FOREIGN KEY (vote_content_id) REFERENCES tl_lavote11_content (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; INSERT INTO tl_lavote11_content(uid, content_id , title , instructions , creation_date , created_by , run_offline , define_later, offline_instructions, online_instructions, content_in_use, retries, lock_on_finish) VALUES (1, ${default_content_id} ,'Voting','Instructions', NOW(), 1,0, 0, '','', 0, 0, 0); Index: lams_tool_wiki/db/sql/create_lams_tool_wiki.sql =================================================================== diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_wiki/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077) +++ lams_tool_wiki/db/sql/create_lams_tool_wiki.sql (.../create_lams_tool_wiki.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -7,10 +7,10 @@ drop table if exists tl_lawiki10_wiki; drop table if exists tl_lawiki10_wiki_page; drop table if exists tl_lawiki10_wiki_page_content; -create table tl_lawiki10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wiki_uid bigint, primary key (uid))TYPE=InnoDB; -create table tl_lawiki10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wiki_uid bigint, wiki_main_page_uid bigint, content_folder_id varchar(255), primary key (uid))TYPE=InnoDB; -create table tl_lawiki10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wiki_session_uid bigint, entry_uid bigint, wiki_edits integer, primary key (uid))TYPE=InnoDB; -create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint, primary key (uid))TYPE=InnoDB; +create table tl_lawiki10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wiki_uid bigint, primary key (uid))ENGINE=InnoDB; +create table tl_lawiki10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wiki_uid bigint, wiki_main_page_uid bigint, content_folder_id varchar(255), primary key (uid))ENGINE=InnoDB; +create table tl_lawiki10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wiki_session_uid bigint, entry_uid bigint, wiki_edits integer, primary key (uid))ENGINE=InnoDB; +create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint, primary key (uid))ENGINE=InnoDB; create table tl_lawiki10_wiki_page ( uid bigint not null auto_increment, wiki_uid bigint, @@ -21,9 +21,9 @@ wiki_session_uid bigint, primary key (uid), unique key wiki_unique_key (wiki_uid, title, wiki_session_uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; -create table tl_lawiki10_wiki_page_content (uid bigint not null auto_increment, wiki_page_uid bigint, body text, editor bigint, edit_date datetime, version bigint, primary key (uid))TYPE=InnoDB; +create table tl_lawiki10_wiki_page_content (uid bigint not null auto_increment, wiki_page_uid bigint, body text, editor bigint, edit_date datetime, version bigint, primary key (uid))ENGINE=InnoDB; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql (.../patch20090121_updateFrom22.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql (.../patch20090121_updateFrom22.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -19,7 +19,7 @@ wiki_session_uid bigint, primary key (uid), unique key wiki_unique_key (wiki_uid, title, wiki_session_uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; INSERT INTO tl_lawiki10_wiki_page_temp SELECT * from tl_lawiki10_wiki_page; drop table if exists tl_lawiki10_wiki_page; Index: lams_tool_wookie/db/sql/create_lams_tool_wookie.sql =================================================================== diff -u -r943e604e405918b3dfafcc3c96875135fe8d1f55 -rf6a03ee21a18654d54498cd94d9f68fbea3b996a --- lams_tool_wookie/db/sql/create_lams_tool_wookie.sql (.../create_lams_tool_wookie.sql) (revision 943e604e405918b3dfafcc3c96875135fe8d1f55) +++ lams_tool_wookie/db/sql/create_lams_tool_wookie.sql (.../create_lams_tool_wookie.sql) (revision f6a03ee21a18654d54498cd94d9f68fbea3b996a) @@ -15,7 +15,7 @@ create_date datetime, wookie_uid bigint, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lawook10_wookie ( uid bigint not null auto_increment, @@ -39,7 +39,7 @@ widget_width integer, widget_height integer, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lawook10_session ( uid bigint not null auto_increment, @@ -55,7 +55,7 @@ widget_maximise bit, widget_identifier varchar(511), primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lawook10_user ( uid bigint not null auto_increment, @@ -68,13 +68,13 @@ entry_uid bigint, user_widget_url varchar(511), primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; create table tl_lawook10_configuration ( uid bigint not null auto_increment, config_key varchar(30) unique, config_value text, primary key (uid) -)TYPE=InnoDB; +)ENGINE=InnoDB; alter table tl_lawook10_attachment add index IN_WOOKIE_ATTACH (wookie_uid), add constraint FK_WOOKIE_ATTACH foreign key (wookie_uid) references tl_lawook10_wookie (uid); alter table tl_lawook10_session add index IN_WOOKIE_SESSION (wookie_uid), add constraint FK_WOOKIE_SESSION foreign key (wookie_uid) references tl_lawook10_wookie (uid);