Index: lams_common/db/sql/create_integration_tables.sql =================================================================== diff -u --- lams_common/db/sql/create_integration_tables.sql (revision 0) +++ lams_common/db/sql/create_integration_tables.sql (revision 5732eae12edb6d5513ae073b1a0f1563deb175ab) @@ -0,0 +1,54 @@ +-- +-- Table structure for table `lams_ext_server_org_map` +-- +DROP TABLE IF EXISTS `lams_ext_server_org_map`; +CREATE TABLE `lams_ext_server_org_map` ( + `sid` int(11) NOT NULL auto_increment, + `serverid` varchar(255) NOT NULL, + `serverkey` text NOT NULL, + `servername` varchar(255) NOT NULL, + `serverdesc` text, + `prefix` varchar(11) NOT NULL, + `userinfo_url` text NOT NULL, + `timeout_url` text NOT NULL, + `disabled` bit(1) NOT NULL, + `orgid` bigint(20) NOT NULL, + PRIMARY KEY (`sid`), + UNIQUE KEY `serverid` (`serverid`), + 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; + +-- +-- Table structure for table `lams_ext_course_class_map` +-- +DROP TABLE IF EXISTS `lams_ext_course_class_map`; +CREATE TABLE `lams_ext_course_class_map` ( + `sid` int(11) NOT NULL auto_increment, + `courseid` varchar(255) NOT NULL, + `classid` bigint(20) NOT NULL, + `ext_server_org_map_id` int(11) NOT NULL, + PRIMARY KEY (`sid`), + KEY `classid` (`classid`), + 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; + + +-- +-- Table structure for table `lams_ext_user_userid_map` +-- +DROP TABLE IF EXISTS `lams_ext_user_userid_map`; +CREATE TABLE `lams_ext_user_userid_map` ( + `sid` int(11) NOT NULL auto_increment, + `foreign_username` varchar(250) NOT NULL, + `user_id` bigint(20) NOT NULL, + `ext_server_org_map_id` int(11) NOT NULL, + PRIMARY KEY (`sid`), + KEY `user_id` (`user_id`), + 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; \ No newline at end of file Index: lams_common/db/sql/insert_types_data.sql =================================================================== diff -u -r4c885f9ce404071ebdb626b74499543010776361 -r5732eae12edb6d5513ae073b1a0f1563deb175ab --- lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 4c885f9ce404071ebdb626b74499543010776361) +++ lams_common/db/sql/insert_types_data.sql (.../insert_types_data.sql) (revision 5732eae12edb6d5513ae073b1a0f1563deb175ab) @@ -212,3 +212,8 @@ INSERT INTO lams_tool_import_support VALUES (8, 'larsrc11', 'urlcontent'); INSERT INTO lams_tool_import_support VALUES (11, 'lavote11', 'ranking'); INSERT INTO lams_tool_import_support VALUES (12, 'lantbk11', 'journal'); + +-- external server mapping to a lams organisation +INSERT INTO lams_ext_server_org_map VALUES + (1,'moodle','moodle','moodle','moodle','mdl','http://localhost/moodle/mod/lamstwo/userinfo.php?ts=%timestamp%&un=%username%&hs=%hash%','http://dummy','\0',7); + Index: lams_common/db/sql/insert_users.sql =================================================================== diff -u -rfef86e6ad47f2ca7468d42de92b6276ba728e5c4 -r5732eae12edb6d5513ae073b1a0f1563deb175ab --- lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision fef86e6ad47f2ca7468d42de92b6276ba728e5c4) +++ lams_common/db/sql/insert_users.sql (.../insert_users.sql) (revision 5732eae12edb6d5513ae073b1a0f1563deb175ab) @@ -25,6 +25,7 @@ insert into lams_workspace (workspace_id, name, default_fld_id) values(6,'Two Test',6); insert into lams_workspace (workspace_id, name, default_fld_id) values(7,'Three Test',7); insert into lams_workspace (workspace_id, name, default_fld_id) values(8,'Four Test',8); +insert into lams_workspace (workspace_id, name, default_fld_id, def_run_seq_fld_id) values(9,'Moodle Test',9,24); insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) values(1,null,'ROOT',1,'20041223','20041223',1); @@ -56,6 +57,12 @@ insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) values(8,null,'Four Test Workspace',8,'20041223','20041223',1); +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(9,1,'Moodle Test',1,'20041223','20041223',1); + +insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id) +values(24,9,'Lesson Sequence Folder',1,'20041223','20041223',2); + insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (1, 1,1); insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (2, 2,2); insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (3, 2,22); @@ -66,6 +73,7 @@ insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (8, 6,6); insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (9, 7,7); insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (10, 8,8); +insert into lams_wkspc_wkspc_folder (id, workspace_id, workspace_folder_id) values (11, 9,9); INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id) VALUES (1, 'Root', null, 'Root Organisation',null,1,NOW(),1,1,1); @@ -79,7 +87,10 @@ VALUES (5, 'Tutorial Group A', 'TUTA', 'Tutorial Group A',4,3,NOW(),null,2,1); INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id) VALUES (6, 'Tutorial Group B', 'TUTB', 'Tutorial Group B',4,3,NOW(),null,2,1); +INSERT INTO lams_organisation (organisation_id, name, code, description, parent_organisation_id, organisation_type_id, create_date, workspace_id, locale_id, organisation_state_id) + VALUES (7, 'Moodle', 'Moodle', 'Moodle Test',1,2,NOW(),9,1,1); + -- users INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone,fax,email,