Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -r9f48c29afb605fbf7a9e0f6f20402b80639b071f -r3ed1429e34ca4653f94fe6ba93811d9e310c4cb2
--- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 9f48c29afb605fbf7a9e0f6f20402b80639b071f)
+++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 3ed1429e34ca4653f94fe6ba93811d9e310c4cb2)
@@ -778,11 +778,11 @@
-
+
-
+
@@ -856,11 +856,11 @@
-
+
-
+
@@ -925,11 +925,11 @@
-
+
-
+
@@ -1705,11 +1705,11 @@
-
+
-
+
@@ -1718,11 +1718,11 @@
-
+
-
+
@@ -1785,11 +1785,11 @@
-
+
-
+
@@ -1798,11 +1798,11 @@
-
+
-
+
@@ -1865,11 +1865,11 @@
-
+
-
+
@@ -1941,11 +1941,11 @@
-
+
-
+
@@ -1997,11 +1997,11 @@
-
+
-
+
@@ -2010,11 +2010,11 @@
-
+
-
+
@@ -2029,11 +2029,11 @@
-
+
-
+
@@ -2067,11 +2067,11 @@
-
+
-
+
@@ -2127,7 +2127,7 @@
-
+
@@ -2142,11 +2142,11 @@
-
+
-
+
@@ -2193,11 +2193,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2232,8 +2245,15 @@
-
+
+
+
+
+
+
+
+
@@ -2411,11 +2431,11 @@
-
+
-
+
@@ -2570,11 +2590,11 @@
-
+
-
+
@@ -2625,11 +2645,11 @@
-
+
-
+
@@ -2700,11 +2720,11 @@
-
+
-
+
@@ -2713,11 +2733,11 @@
-
+
-
+
@@ -2901,11 +2921,11 @@
-
+
-
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -rbf3d839b523336d9b97a1b135a358d898605d6be -r3ed1429e34ca4653f94fe6ba93811d9e310c4cb2
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision bf3d839b523336d9b97a1b135a358d898605d6be)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 3ed1429e34ca4653f94fe6ba93811d9e310c4cb2)
@@ -66,18 +66,18 @@
, PRIMARY KEY (tool_session_state_id)
)TYPE=InnoDB;
---CREATE TABLE lams_user_tool_session_state (
--- user_tool_session_state_id INT(3) NOT NULL
--- , description VARCHAR(255) NOT NULL
--- , PRIMARY KEY (user_tool_session_state_id)
---)TYPE=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;
+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;
+
CREATE TABLE lams_authentication_method_type (
authentication_method_type_id INT(3) NOT NULL DEFAULT 0
, description VARCHAR(64) NOT NULL
@@ -117,7 +117,7 @@
CREATE TABLE lams_grouping (
grouping_id BIGINT(20) NOT NULL DEFAULT 0 AUTO_INCREMENT
- , grouping_type_id INT(11) NOT NULL DEFAULT 0
+ , grouping_type_id INT(11) NOT NULL
, number_of_groups INT(11)
, learners_per_group INT(11)
, staff_group_id BIGINT(20) DEFAULT 0
@@ -204,7 +204,7 @@
, parent_learning_design_id BIGINT(20)
, open_date_time DATETIME
, close_date_time DATETIME
- , workspace_folder_id BIGINT(20) NOT NULL DEFAULT 0
+ , workspace_folder_id BIGINT(20) NOT NULL
, PRIMARY KEY (learning_design_id)
, INDEX (parent_learning_design_id)
, CONSTRAINT FK_lams_learning_design_2 FOREIGN KEY (parent_learning_design_id)
@@ -294,6 +294,7 @@
, gate_end_date_time DATETIME
, library_activity_ui_image VARCHAR(255)
, create_grouping_id BIGINT(20)
+ , library_activity_id BIGINT(20)
, PRIMARY KEY (activity_id)
, INDEX (learning_library_id)
, CONSTRAINT FK_lams_learning_activity_7 FOREIGN KEY (learning_library_id)
@@ -319,78 +320,87 @@
, INDEX (create_grouping_id)
, CONSTRAINT FK_lams_learning_activity_9 FOREIGN KEY (create_grouping_id)
REFERENCES lams_grouping (grouping_id)
+ , INDEX (library_activity_id)
+ , CONSTRAINT FK_lams_learning_activity_11 FOREIGN KEY (library_activity_id)
+ REFERENCES lams_learning_activity (activity_id)
)TYPE=InnoDB;
-CREATE TABLE lams_learner_progress (
- learner_progress_id BIGINT(20) NOT NULL AUTO_INCREMENT
- , user_id BIGINT(20) NOT NULL
- , lesson_id BIGINT(20) NOT NULL
- , lesson_completed_flag TINYINT(1) NOT NULL DEFAULT 0
- , start_date_time DATETIME NOT NULL
- , finish_date_time DATETIME
- , current_activity_id BIGINT(20)
- , next_activity_id BIGINT(20)
- , PRIMARY KEY (learner_progress_id)
- , INDEX (user_id)
- , CONSTRAINT FK_lams_learner_progress_1 FOREIGN KEY (user_id)
- REFERENCES lams_user (user_id)
- , INDEX (lesson_id)
- , CONSTRAINT FK_lams_learner_progress_2 FOREIGN KEY (lesson_id)
- REFERENCES lams_lesson (lesson_id)
- , INDEX (current_activity_id)
- , CONSTRAINT FK_lams_learner_progress_3 FOREIGN KEY (current_activity_id)
- REFERENCES lams_learning_activity (activity_id)
- , INDEX (next_activity_id)
- , CONSTRAINT FK_lams_learner_progress_4 FOREIGN KEY (next_activity_id)
- REFERENCES lams_learning_activity (activity_id)
+CREATE TABLE lams_learner_progress (
+ learner_progress_id BIGINT(20) NOT NULL AUTO_INCREMENT
+ , user_id BIGINT(20) NOT NULL
+ , lesson_id BIGINT(20) NOT NULL
+ , lesson_completed_flag TINYINT(1) NOT NULL DEFAULT 0
+ , start_date_time DATETIME NOT NULL
+ , finish_date_time DATETIME
+ , current_activity_id BIGINT(20)
+ , next_activity_id BIGINT(20)
+ , PRIMARY KEY (learner_progress_id)
+ , INDEX (user_id)
+ , CONSTRAINT FK_lams_learner_progress_1 FOREIGN KEY (user_id)
+ REFERENCES lams_user (user_id)
+ , INDEX (lesson_id)
+ , CONSTRAINT FK_lams_learner_progress_2 FOREIGN KEY (lesson_id)
+ REFERENCES lams_lesson (lesson_id)
+ , INDEX (current_activity_id)
+ , CONSTRAINT FK_lams_learner_progress_3 FOREIGN KEY (current_activity_id)
+ REFERENCES lams_learning_activity (activity_id)
+ , INDEX (next_activity_id)
+ , CONSTRAINT FK_lams_learner_progress_4 FOREIGN KEY (next_activity_id)
+ REFERENCES lams_learning_activity (activity_id)
)TYPE=InnoDB;
-CREATE TABLE lams_tool_session_type (
- tool_session_type_id INT(11) NOT NULL DEFAULT 0
- , description VARCHAR(128) NOT NULL
- , PRIMARY KEY (tool_session_type_id)
+CREATE TABLE lams_user_organisation_role (
+ user_organisation_role_id BIGINT(20) NOT NULL DEFAULT 0 AUTO_INCREMENT
+ , user_organisation_id BIGINT(20) NOT NULL
+ , role_id INT(6) NOT NULL
+ , PRIMARY KEY (user_organisation_role_id)
+ , INDEX (role_id)
+ , CONSTRAINT FK_lams_user_organisation_role_2 FOREIGN KEY (role_id)
+ REFERENCES lams_role (role_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+ , 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;
CREATE TABLE lams_tool_session (
tool_session_id BIGINT(20) NOT NULL AUTO_INCREMENT
- , tool_session_type_id INT(11) NOT NULL
- , group_id BIGINT(20)
- , user_id BIGINT(20)
+ , tool_session_type_id INT(3) NOT NULL
+ , lesson_id BIGINT(20) NOT NULL
, activity_id BIGINT(20) NOT NULL
, tool_session_key BIGINT(20) NOT NULL
, tool_session_state_id INT(3) NOT NULL
, create_date_time DATETIME NOT NULL
+ , group_id BIGINT(20)
+ , user_id BIGINT(20)
+ , unique_key VARCHAR(128) NOT NULL
+ , UNIQUE UQ_lams_tool_session_1 (unique_key)
, PRIMARY KEY (tool_session_id)
- , INDEX (tool_session_type_id)
- , CONSTRAINT FK_lams_tool_session_1 FOREIGN KEY (tool_session_type_id)
- REFERENCES lams_tool_session_type (tool_session_type_id)
, INDEX (group_id)
- , CONSTRAINT FK_lams_tool_session_2 FOREIGN KEY (group_id)
+ , CONSTRAINT FK_lams_tool_session_1 FOREIGN KEY (group_id)
REFERENCES lams_group (group_id)
- , INDEX (user_id)
- , CONSTRAINT FK_lams_tool_session_3 FOREIGN KEY (user_id)
- REFERENCES lams_user (user_id)
, INDEX (tool_session_state_id)
, CONSTRAINT FK_lams_tool_session_4 FOREIGN KEY (tool_session_state_id)
REFERENCES lams_tool_session_state (tool_session_state_id)
+ , INDEX (group_id)
+ , CONSTRAINT FK_lams_tool_session_3 FOREIGN KEY (group_id)
+ REFERENCES lams_group (group_id)
+ , INDEX (user_id)
+ , CONSTRAINT FK_lams_tool_session_5 FOREIGN KEY (user_id)
+ REFERENCES lams_user (user_id)
+ , INDEX (lesson_id)
+ , CONSTRAINT FK_lams_tool_session_6 FOREIGN KEY (lesson_id)
+ REFERENCES lams_lesson (lesson_id)
+ , INDEX (tool_session_type_id)
+ , CONSTRAINT FK_lams_tool_session_7 FOREIGN KEY (tool_session_type_id)
+ REFERENCES lams_tool_session_type (tool_session_type_id)
+ , INDEX (activity_id)
+ , CONSTRAINT FK_lams_tool_session_8 FOREIGN KEY (activity_id)
+ REFERENCES lams_learning_activity (activity_id)
)TYPE=InnoDB;
-CREATE TABLE lams_user_organisation_role (
- user_organisation_role_id BIGINT(20) NOT NULL DEFAULT 0 AUTO_INCREMENT
- , user_organisation_id BIGINT(20) NOT NULL DEFAULT 0
- , role_id INT(6) NOT NULL DEFAULT 0
- , PRIMARY KEY (user_organisation_role_id)
- , INDEX (role_id)
- , CONSTRAINT FK_lams_user_organisation_role_2 FOREIGN KEY (role_id)
- REFERENCES lams_role (role_id) ON DELETE NO ACTION ON UPDATE NO ACTION
- , 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;
-
CREATE TABLE lams_progress_completed (
learner_progress_id BIGINT(20) NOT NULL
- , activity_id BIGINT(20) NOT NULL DEFAULT 0
+ , activity_id BIGINT(20) NOT NULL
, PRIMARY KEY (learner_progress_id, activity_id)
, INDEX (learner_progress_id)
, CONSTRAINT FK_lams_progress_completed_1 FOREIGN KEY (learner_progress_id)
@@ -402,7 +412,7 @@
CREATE TABLE lams_progress_attempted (
learner_progress_id BIGINT(20) NOT NULL
- , activity_id BIGINT(20) NOT NULL DEFAULT 0
+ , activity_id BIGINT(20) NOT NULL
, PRIMARY KEY (learner_progress_id, activity_id)
, INDEX (learner_progress_id)
, CONSTRAINT FK_lams_progress_current_1 FOREIGN KEY (learner_progress_id)
@@ -412,25 +422,9 @@
REFERENCES lams_learning_activity (activity_id)
)TYPE=InnoDB;
---CREATE TABLE lams_user_tool_session (
--- tool_session_id BIGINT(20) NOT NULL
--- , user_id BIGINT(20) NOT NULL DEFAULT 0
--- , user_tool_session_state_id INT(3) NOT NULL
--- , PRIMARY KEY (tool_session_id, user_id)
--- , INDEX (tool_session_id)
--- , CONSTRAINT FK_lams_user_tool_session_1 FOREIGN KEY (tool_session_id)
--- REFERENCES lams_tool_session (tool_session_id)
--- , INDEX (user_id)
--- , CONSTRAINT FK_lams_user_tool_session_2 FOREIGN KEY (user_id)
--- REFERENCES lams_user (user_id)
--- , INDEX (user_tool_session_state_id)
--- , CONSTRAINT FK_lams_user_tool_session_3 FOREIGN KEY (user_tool_session_state_id)
--- REFERENCES lams_user_tool_session_state (user_tool_session_state_id)
---)TYPE=InnoDB;
-
CREATE TABLE lams_user_group (
- user_id BIGINT(20) NOT NULL DEFAULT 0
- , group_id BIGINT(20) NOT NULL DEFAULT 0
+ user_id BIGINT(20) NOT NULL
+ , group_id BIGINT(20) NOT NULL
, PRIMARY KEY (user_id, group_id)
, INDEX (user_id)
, CONSTRAINT FK_lams_user_group_1 FOREIGN KEY (user_id)
@@ -462,7 +456,7 @@
CREATE TABLE lams_lesson_learner (
lesson_id BIGINT(20) NOT NULL
- , user_id BIGINT(20) NOT NULL DEFAULT 0
+ , user_id BIGINT(20) NOT NULL
, INDEX (lesson_id)
, CONSTRAINT FK_lams_lesson_learner_1 FOREIGN KEY (lesson_id)
REFERENCES lams_lesson (lesson_id)
Index: lams_common/db/sql/drop_lams_11_tables.sql
===================================================================
diff -u -r30f0dc9c0ccc658a39c3ecf7bc11657f72f7f0f1 -r3ed1429e34ca4653f94fe6ba93811d9e310c4cb2
--- lams_common/db/sql/drop_lams_11_tables.sql (.../drop_lams_11_tables.sql) (revision 30f0dc9c0ccc658a39c3ecf7bc11657f72f7f0f1)
+++ lams_common/db/sql/drop_lams_11_tables.sql (.../drop_lams_11_tables.sql) (revision 3ed1429e34ca4653f94fe6ba93811d9e310c4cb2)
@@ -1,37 +1,35 @@
-DROP TABLE IF EXISTS lams_learning_transition;
-DROP TABLE IF EXISTS lams_activity_learners;
-DROP TABLE IF EXISTS lams_tool_content;
-DROP TABLE IF EXISTS lams_user_group;
-DROP TABLE IF EXISTS lams_user_tool_session;
-DROP TABLE IF EXISTS lams_progress_attempted;
-DROP TABLE IF EXISTS lams_progress_completed;
-DROP TABLE IF EXISTS lams_user_organisation_role;
-DROP TABLE IF EXISTS lams_tool_session;
-DROP TABLE IF EXISTS lams_learner_progress;
-DROP TABLE IF EXISTS lams_learning_activity;
-DROP TABLE IF EXISTS lams_lesson_learner;
-DROP TABLE IF EXISTS lams_lesson;
-DROP TABLE IF EXISTS lams_user_organisation;
-DROP TABLE IF EXISTS lams_group;
-DROP TABLE IF EXISTS lams_learning_design;
-DROP TABLE IF EXISTS lams_user;
-DROP TABLE IF EXISTS lams_organisation;
-DROP TABLE IF EXISTS lams_grouping;
-DROP TABLE IF EXISTS lams_workspace;
-DROP TABLE IF EXISTS lams_workspace_folder;
-DROP TABLE IF EXISTS lams_authentication_method;
-DROP TABLE IF EXISTS lams_authentication_method_type;
-DROP TABLE IF EXISTS lams_lesson_state;
-DROP TABLE IF EXISTS lams_user_tool_session_state;
-DROP TABLE IF EXISTS lams_tool_session_state;
-DROP TABLE IF EXISTS lams_tool;
-DROP TABLE IF EXISTS lams_role;
-DROP TABLE IF EXISTS lams_organisation_type;
-DROP TABLE IF EXISTS lams_learning_library;
-DROP TABLE IF EXISTS lams_learning_activity_type;
-DROP TABLE IF EXISTS lams_grouping_type;
-DROP TABLE IF EXISTS lams_gate_activity_level;
-DROP TABLE IF EXISTS lams_tool_session_type;
+DROP TABLE lams_learning_transition;
+DROP TABLE lams_lesson_learner;
+DROP TABLE lams_activity_learners;
+DROP TABLE lams_tool_content;
+DROP TABLE lams_user_group;
+DROP TABLE lams_progress_attempted;
+DROP TABLE lams_progress_completed;
+DROP TABLE lams_tool_session;
+DROP TABLE lams_user_organisation_role;
+DROP TABLE lams_learner_progress;
+DROP TABLE lams_learning_activity;
+DROP TABLE lams_lesson;
+DROP TABLE lams_user_organisation;
+DROP TABLE lams_group;
+DROP TABLE lams_learning_design;
+DROP TABLE lams_user;
+DROP TABLE lams_organisation;
+DROP TABLE lams_grouping;
+DROP TABLE lams_workspace;
+DROP TABLE lams_workspace_folder;
+DROP TABLE lams_authentication_method;
+DROP TABLE lams_authentication_method_type;
+DROP TABLE lams_tool_session_type;
+DROP TABLE lams_lesson_state;
+DROP TABLE lams_tool_session_state;
+DROP TABLE lams_tool;
+DROP TABLE lams_role;
+DROP TABLE lams_organisation_type;
+DROP TABLE lams_learning_library;
+DROP TABLE lams_learning_activity_type;
+DROP TABLE lams_grouping_type;
+DROP TABLE lams_gate_activity_level;
@@ -64,3 +62,4 @@
+
Index: lams_common/db/sql/insert_types_data.sql
===================================================================
diff -u -r30f0dc9c0ccc658a39c3ecf7bc11657f72f7f0f1 -r3ed1429e34ca4653f94fe6ba93811d9e310c4cb2
--- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 30f0dc9c0ccc658a39c3ecf7bc11657f72f7f0f1)
+++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 3ed1429e34ca4653f94fe6ba93811d9e310c4cb2)
@@ -1,19 +1,3 @@
-# Connection: ROOT LOCAL
-# Host: localhost
-# Saved: 2004-11-26 11:35:47
-#
-# Connection: ROOT LOCAL
-# Host: localhost
-# Saved: 2004-11-22 11:44:40
-#
-# Connection: ROOT LOCAL
-# Host: localhost
-# Saved: 2004-11-09 15:04:37
-#
-# Connection: ROOT LOCAL
-# Host: localhost
-# Saved: 2004-11-09 15:01:18
-#
INSERT INTO lams_role VALUES (1, 'SYSADMIN', 'LAMS System Adminstrator', NOW());
INSERT INTO lams_role VALUES (2, 'ADMIN', 'Organization Adminstrator', NOW());
INSERT INTO lams_role VALUES (3, 'AUTHOR', 'Authors Learning Designs', NOW());
@@ -33,6 +17,10 @@
INSERT INTO lams_grouping_type VALUES (2, 'CHOSEN_GROUPING');
INSERT INTO lams_grouping_type VALUES (3, 'CLASS_GROUPING');
+INSERT INTO lams_tool_session_type VALUES (1, 'NON_GROUPED');
+INSERT INTO lams_tool_session_type VALUES (2, 'GROUPED');
+
+
INSERT INTO lams_learning_activity_type VALUES (1, 'TOOL');
INSERT INTO lams_learning_activity_type VALUES (2, 'GROUPING_RANDOM');
INSERT INTO lams_learning_activity_type VALUES (3, 'GROUPING_CHOSEN');
@@ -48,19 +36,10 @@
INSERT INTO lams_gate_activity_level VALUES (2, 'GROUP');
INSERT INTO lams_gate_activity_level VALUES (3, 'CLASS');
-INSERT INTO lams_tool_session_state VALUES (1, 'NOT ATTEMPTED');
-INSERT INTO lams_tool_session_state VALUES (2, 'INCOMPLETE');
-INSERT INTO lams_tool_session_state VALUES (3, 'COMPLETED');
+INSERT INTO lams_tool_session_state VALUES (1, 'STARTED');
+INSERT INTO lams_tool_session_state VALUES (2, 'ENDED');
---INSERT INTO lams_user_tool_session_state VALUES (1, 'JOINED');
---INSERT INTO lams_user_tool_session_state VALUES (2, 'LEFT' );
---INSERT INTO lams_user_tool_session_state VALUES (3, 'SUSPENDED');
---INSERT INTO lams_user_tool_session_state VALUES (4, 'RESUMED');
---INSERT INTO lams_user_tool_session_state VALUES (5, 'ERROR');
-INSERT INTO lams_tool_session_type VALUES (1, 'GROUPED');
-INSERT INTO lams_tool_session_type VALUES (2, 'NON_GROUPED');
-
INSERT INTO lams_lesson_state VALUES (1, 'CREATED');
INSERT INTO lams_lesson_state VALUES (2, 'NOT_STARTED');
INSERT INTO lams_lesson_state VALUES (3, 'STARTED');
@@ -72,3 +51,4 @@
+