Index: lams_common/db/model/lams_11.clay =================================================================== diff -u -r7c1c35c73c2ca7a810d52d69c673d4efece44e10 -r829c9dce2185cd34ab98b4f1e32ca157adb2bf0d --- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 7c1c35c73c2ca7a810d52d69c673d4efece44e10) +++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 829c9dce2185cd34ab98b4f1e32ca157adb2bf0d) @@ -937,8 +937,8 @@ - + @@ -957,8 +957,8 @@ - + @@ -973,6 +973,19 @@ + + + + + + + + + + + + + @@ -1227,7 +1240,7 @@ - + @@ -1255,6 +1268,19 @@ + + + + + + + + + + + + + @@ -1277,7 +1303,7 @@
- + @@ -2189,6 +2215,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2203,6 +2267,13 @@ + + + + + + + @@ -2217,7 +2288,7 @@
- + @@ -2258,7 +2329,7 @@ - + @@ -2280,8 +2351,8 @@ - + @@ -2293,8 +2364,8 @@ - + @@ -2505,6 +2576,19 @@ + + + + + + + + + + + + + @@ -2594,6 +2678,19 @@ + + + + + + + + + + + + + @@ -2607,6 +2704,19 @@ + + + + + + + + + + + + + @@ -2682,6 +2792,12 @@ + + + + + + @@ -2697,12 +2813,20 @@ - + + + + + + + + +
- + @@ -3420,7 +3544,7 @@ The main lookup is done on name, but given the small number of rows a complete table scan should be fine. A name index would probably be about the same size as the table anyway. - + @@ -3508,7 +3632,7 @@
- + @@ -3835,6 +3959,39 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== diff -u -r2dff638b50a1aecb8819b856e9467cafac1ea844 -r829c9dce2185cd34ab98b4f1e32ca157adb2bf0d --- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 2dff638b50a1aecb8819b856e9467cafac1ea844) +++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 829c9dce2185cd34ab98b4f1e32ca157adb2bf0d) @@ -20,6 +20,7 @@ learning_library_id BIGINT(20) NOT NULL AUTO_INCREMENT , description TEXT , title VARCHAR(255) + , valid_flag TINYINT(1) NOT NULL DEFAULT 1 , create_date_time DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' , PRIMARY KEY (learning_library_id) )TYPE=InnoDB; @@ -41,27 +42,6 @@ )TYPE=InnoDB; CREATE INDEX gname ON lams_role (name ASC); -CREATE TABLE lams_tool ( - tool_id BIGINT(20) NOT NULL AUTO_INCREMENT - , tool_signature VARCHAR(64) NOT NULL - , service_name VARCHAR(255) NOT NULL - , tool_display_name VARCHAR(255) NOT NULL - , description TEXT - , default_tool_content_id BIGINT(20) NOT NULL - , supports_grouping_flag TINYINT(1) NOT NULL DEFAULT 0 - , supports_define_later_flag TINYINT(1) NOT NULL DEFAULT 0 - , supports_moderation_flag TINYINT(1) NOT NULL - , learner_url TEXT NOT NULL - , author_url TEXT NOT NULL - , define_later_url TEXT - , export_portfolio_url TEXT NOT NULL - , monitor_url TEXT NOT NULL - , contribute_url TEXT - , UNIQUE UQ_lams_tool_sig (tool_signature) - , UNIQUE UQ_lams_tool_class_name (service_name) - , PRIMARY KEY (tool_id) -)TYPE=InnoDB; - CREATE TABLE lams_tool_session_state ( tool_session_state_id INT(3) NOT NULL , description VARCHAR(255) NOT NULL @@ -116,6 +96,12 @@ , PRIMARY KEY (credential_id) )TYPE=InnoDB; +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; + CREATE TABLE lams_authentication_method_type ( authentication_method_type_id INT(3) NOT NULL , description VARCHAR(64) NOT NULL @@ -138,10 +124,17 @@ , parent_folder_id BIGINT(20) , name VARCHAR(64) NOT NULL , workspace_id BIGINT(20) NOT NULL + , user_id BIGINT(20) NOT NULL + , create_date_time DATETIME NOT NULL + , last_modified_date_time DATETIME NOT NULL + , lams_workspace_folder_type_id INT(3) NOT NULL , PRIMARY KEY (workspace_folder_id) , INDEX (parent_folder_id) , CONSTRAINT FK_lams_workspace_folder_2 FOREIGN KEY (parent_folder_id) REFERENCES lams_workspace_folder (workspace_folder_id) ON DELETE NO ACTION ON UPDATE NO ACTION + , 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; CREATE TABLE lams_workspace ( @@ -212,6 +205,47 @@ CREATE UNIQUE INDEX UQ_lams_user_login ON lams_user (login ASC); CREATE INDEX login ON lams_user (login ASC); +CREATE TABLE lams_grouping ( + grouping_id BIGINT(20) NOT NULL AUTO_INCREMENT + , grouping_ui_id INT(11) + , grouping_type_id INT(11) NOT NULL + , number_of_groups INT(11) + , learners_per_group INT(11) + , staff_group_id BIGINT(20) DEFAULT 0 + , max_number_of_groups INT(3) + , PRIMARY KEY (grouping_id) + , 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; + +CREATE TABLE lams_tool ( + tool_id BIGINT(20) NOT NULL AUTO_INCREMENT + , tool_signature VARCHAR(64) NOT NULL + , service_name VARCHAR(255) NOT NULL + , tool_display_name VARCHAR(255) NOT NULL + , description TEXT + , learning_library_id BIGINT(20) NOT NULL + , default_tool_content_id BIGINT(20) NOT NULL + , valid_flag TINYINT(1) NOT NULL DEFAULT 1 + , supports_grouping_flag TINYINT(1) NOT NULL DEFAULT 0 + , supports_define_later_flag TINYINT(1) NOT NULL DEFAULT 0 + , supports_moderation_flag TINYINT(1) NOT NULL + , learner_url TEXT NOT NULL + , author_url TEXT NOT NULL + , define_later_url TEXT + , export_portfolio_url TEXT NOT NULL + , monitor_url TEXT NOT NULL + , contribute_url TEXT + , moderation_url TEXT + , UNIQUE UQ_lams_tool_sig (tool_signature) + , UNIQUE UQ_lams_tool_class_name (service_name) + , PRIMARY KEY (tool_id) + , INDEX (learning_library_id) + , CONSTRAINT FK_lams_tool_1 FOREIGN KEY (learning_library_id) + REFERENCES lams_learning_library (learning_library_id) +)TYPE=InnoDB; + CREATE TABLE lams_learning_design ( learning_design_id BIGINT(20) NOT NULL AUTO_INCREMENT , learning_design_ui_id INT(11) @@ -237,6 +271,8 @@ , lesson_name VARCHAR(255) , lesson_id BIGINT(20) , lesson_start_date_time DATETIME + , lesson_name VARCHAR(255) + , last_modified_date_time DATETIME NOT NULL , PRIMARY KEY (learning_design_id) , INDEX (parent_learning_design_id) , CONSTRAINT FK_lams_learning_design_2 FOREIGN KEY (parent_learning_design_id) @@ -256,20 +292,6 @@ )TYPE=InnoDB; CREATE INDEX idx_design_first_act ON lams_learning_design (first_activity_id ASC); -CREATE TABLE lams_grouping ( - grouping_id BIGINT(20) NOT NULL AUTO_INCREMENT - , grouping_ui_id INT(11) - , grouping_type_id INT(11) NOT NULL - , number_of_groups INT(11) - , learners_per_group INT(11) - , staff_group_id BIGINT(20) DEFAULT 0 - , max_number_of_groups INT(3) - , PRIMARY KEY (grouping_id) - , 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; - CREATE TABLE lams_group ( group_id BIGINT(20) NOT NULL AUTO_INCREMENT , grouping_id BIGINT(20) NOT NULL @@ -297,7 +319,7 @@ lesson_id BIGINT(20) NOT NULL AUTO_INCREMENT , learning_design_id BIGINT(20) NOT NULL , user_id BIGINT(20) NOT NULL - , name VARCHAR(255) + , name VARCHAR(255) NOT NULL , description TEXT , create_date_time DATETIME NOT NULL , organisation_id BIGINT(20) @@ -405,6 +427,7 @@ , current_activity_id BIGINT(20) , next_activity_id BIGINT(20) , previous_activity_id BIGINT(20) + , requires_restart_flag TINYINT(1) NOT NULL , PRIMARY KEY (learner_progress_id) , INDEX (user_id) , CONSTRAINT FK_lams_learner_progress_1 FOREIGN KEY (user_id) Index: lams_common/db/sql/drop_lams_11_tables.sql =================================================================== diff -u -re378d1a8a946a6857eb435c00602df59e8a0e40f -r829c9dce2185cd34ab98b4f1e32ca157adb2bf0d --- lams_common/db/sql/drop_lams_11_tables.sql (.../drop_lams_11_tables.sql) (revision e378d1a8a946a6857eb435c00602df59e8a0e40f) +++ lams_common/db/sql/drop_lams_11_tables.sql (.../drop_lams_11_tables.sql) (revision 829c9dce2185cd34ab98b4f1e32ca157adb2bf0d) @@ -1,5 +1,9 @@ # Connection: ROOT LOCAL # Host: localhost +# Saved: 2005-03-10 14:16:48 +# +# Connection: ROOT LOCAL +# Host: localhost # Saved: 2005-02-16 16:04:11 SET FOREIGN_KEY_CHECKS=0; @@ -45,5 +49,6 @@ DROP TABLE IF EXISTS lams_cr_workspace_credential; DROP TABLE IF EXISTS lams_cr_workspace; DROP TABLE IF EXISTS lams_cr_credential; +DROP TABLE IF EXISTS lams_workspace_folder_type; SET FOREIGN_KEY_CHECKS=1; Index: lams_common/db/sql/insert_types_data.sql =================================================================== diff -u -r2fff5cdf1e862ec92aec2272ec3d3dcab59cd976 -r829c9dce2185cd34ab98b4f1e32ca157adb2bf0d --- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 2fff5cdf1e862ec92aec2272ec3d3dcab59cd976) +++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 829c9dce2185cd34ab98b4f1e32ca157adb2bf0d) @@ -1,5 +1,21 @@ # Connection: ROOT LOCAL # Host: localhost +# Saved: 2005-03-10 14:27:37 +# +# Connection: ROOT LOCAL +# Host: localhost +# Saved: 2005-03-10 14:24:25 +# +# Connection: ROOT LOCAL +# Host: localhost +# Saved: 2005-03-10 14:22:28 +# +# Connection: ROOT LOCAL +# Host: localhost +# Saved: 2005-03-10 14:01:01 +# +# Connection: ROOT LOCAL +# Host: localhost # Saved: 2005-02-16 16:03:41 # # Connection: ROOT LOCAL @@ -65,5 +81,20 @@ INSERT into lams_copy_type VALUES(2,'LESSON'); INSERT into lams_copy_type VALUES(3,'PREVIEW'); +INSERT into lams_workspace_folder_type VALUES (1, 'NORMAL'); +INSERT into lams_workspace_folder_type VALUES (2, 'RUN SEQUENCES'); +INSERT INTO lams_authentication_method VALUES (1, 1, 'LAMS-Database'); +INSERT INTO lams_authentication_method VALUES (2, 2, 'Oxford-WebAuth'); +INSERT INTO lams_authentication_method VALUES (3, 3, 'MQ-LDAP'); +INSERT INTO lams_activity_category VALUES (1 ,'SYSTEM'); +INSERT INTO lams_activity_category VALUES (2 ,'COLLABORATION'); +INSERT INTO lams_activity_category VALUES (3 ,'ASSESSMENT'); +INSERT INTO lams_activity_category VALUES (4 ,'CONTENT'); +INSERT INTO lams_activity_category VALUES (5 ,'SPLIT'); + + + + +