Index: lams_tool_nb/db/model/lams_tool_nb.clay =================================================================== diff -u -r0fd3af4e71c48d1f797d0e809889e51519efb18c -rcc796564ee86ee3e7427d66c174fa4d407116f7b --- lams_tool_nb/db/model/lams_tool_nb.clay (.../lams_tool_nb.clay) (revision 0fd3af4e71c48d1f797d0e809889e51519efb18c) +++ lams_tool_nb/db/model/lams_tool_nb.clay (.../lams_tool_nb.clay) (revision cc796564ee86ee3e7427d66c174fa4d407116f7b) @@ -14,8 +14,8 @@ - + @@ -37,11 +37,10 @@ - + - - - + + @@ -88,6 +87,19 @@ + + + + + + + + + + + + + @@ -129,8 +141,8 @@ - + @@ -155,8 +167,8 @@ - + @@ -201,6 +213,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Index: lams_tool_nb/db/sql/create_lams_tool_nb.sql =================================================================== diff -u -r0fd3af4e71c48d1f797d0e809889e51519efb18c -rcc796564ee86ee3e7427d66c174fa4d407116f7b --- lams_tool_nb/db/sql/create_lams_tool_nb.sql (.../create_lams_tool_nb.sql) (revision 0fd3af4e71c48d1f797d0e809889e51519efb18c) +++ lams_tool_nb/db/sql/create_lams_tool_nb.sql (.../create_lams_tool_nb.sql) (revision cc796564ee86ee3e7427d66c174fa4d407116f7b) @@ -1,12 +1,13 @@ CREATE TABLE lams.tl_lanb11_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , nb_content_id BIGINT(20) UNIQUE NOT NULL - , title VARCHAR(255) + , title TEXT , content TEXT , online_instructions TEXT , offline_instructions TEXT , define_later TINYINT(1) , force_offline TINYINT(1) + , content_in_use TINYINT(1) , creator_user_id BIGINT(20) , date_created DATETIME , date_updated DATETIME @@ -26,3 +27,16 @@ REFERENCES lams.tl_lanb11_content (uid) )TYPE=InnoDB; +CREATE TABLE lams.tl_lanb11_user ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , user_id BIGINT(20) UNIQUE NOT NULL + , nb_session_uid BIGINT(20) NOT NULL + , username VARCHAR(50) + , fullname VARCHAR(50) + , user_status VARCHAR(50) + , PRIMARY KEY (uid) + , INDEX (nb_session_uid) + , CONSTRAINT FK_tl_lanb11_user_1 FOREIGN KEY (nb_session_uid) + REFERENCES lams.tl_lanb11_session (uid) +)TYPE=InnoDB; + Index: lams_tool_nb/db/sql/drop_lams_tool_nb.sql =================================================================== diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -rcc796564ee86ee3e7427d66c174fa4d407116f7b --- lams_tool_nb/db/sql/drop_lams_tool_nb.sql (.../drop_lams_tool_nb.sql) (revision a766c8fe51dfa314947b20ef98e525d63b328fbe) +++ lams_tool_nb/db/sql/drop_lams_tool_nb.sql (.../drop_lams_tool_nb.sql) (revision cc796564ee86ee3e7427d66c174fa4d407116f7b) @@ -1,4 +1,4 @@ - +DROP TABLE IF EXISTS lams.tl_lanb11_user; DROP TABLE IF EXISTS lams.tl_lanb11_session; DROP TABLE IF EXISTS lams.tl_lanb11_content; Index: lams_tool_nb/db/sql/init_lams_tool_nb.sql =================================================================== diff -u -r0fd3af4e71c48d1f797d0e809889e51519efb18c -rcc796564ee86ee3e7427d66c174fa4d407116f7b --- lams_tool_nb/db/sql/init_lams_tool_nb.sql (.../init_lams_tool_nb.sql) (revision 0fd3af4e71c48d1f797d0e809889e51519efb18c) +++ lams_tool_nb/db/sql/init_lams_tool_nb.sql (.../init_lams_tool_nb.sql) (revision cc796564ee86ee3e7427d66c174fa4d407116f7b) @@ -1,19 +1,21 @@ USE lams; -- Ensure an existing table does not exist +DROP TABLE IF EXISTS lams.tl_lanb11_user; DROP TABLE IF EXISTS lams.tl_lanb11_session; DROP TABLE IF EXISTS lams.tl_lanb11_content; -- Create a fresh copy of the noticeboard table CREATE TABLE lams.tl_lanb11_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , nb_content_id BIGINT(20) UNIQUE NOT NULL - , title VARCHAR(255) + , title TEXT , content TEXT , online_instructions TEXT , offline_instructions TEXT , define_later TINYINT(1) , force_offline TINYINT(1) + , content_in_use TINYINT(1) , creator_user_id BIGINT(20) , date_created DATETIME , date_updated DATETIME @@ -33,3 +35,15 @@ REFERENCES lams.tl_lanb11_content (uid) )TYPE=InnoDB; +CREATE TABLE lams.tl_lanb11_user ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , user_id BIGINT(20) UNIQUE NOT NULL + , nb_session_uid BIGINT(20) NOT NULL + , username VARCHAR(50) + , fullname VARCHAR(50) + , user_status VARCHAR(50) + , PRIMARY KEY (uid) + , INDEX (nb_session_uid) + , CONSTRAINT FK_tl_lanb11_user_1 FOREIGN KEY (nb_session_uid) + REFERENCES lams.tl_lanb11_session (uid) +)TYPE=InnoDB; Index: lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql =================================================================== diff -u -r0fd3af4e71c48d1f797d0e809889e51519efb18c -rcc796564ee86ee3e7427d66c174fa4d407116f7b --- lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql (.../insert_lams_tool_nb_data.sql) (revision 0fd3af4e71c48d1f797d0e809889e51519efb18c) +++ lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql (.../insert_lams_tool_nb_data.sql) (revision cc796564ee86ee3e7427d66c174fa4d407116f7b) @@ -9,6 +9,7 @@ offline_instructions, define_later, force_offline, + content_in_use, creator_user_id, date_created, date_updated) @@ -20,6 +21,7 @@ 'Enter the offline instructions here', 0, 0, + 0, '2300', now(), NULL); @@ -36,4 +38,17 @@ LAST_INSERT_ID(), now(), now(), - 'NOT_ATTEMPTED'); \ No newline at end of file + 'NOT_ATTEMPTED'); + +INSERT INTO tl_lanb11_user ( uid, + user_id, + nb_session_uid, + username, + fullname, + user_status) +VALUES (null, + '2600', + LAST_INSERT_ID(), + 'test', + 'test', + 'INCOMPLETE'); \ No newline at end of file Index: lams_tool_nb/db/sql/lams_tool_nb.sql =================================================================== diff -u -r0fd3af4e71c48d1f797d0e809889e51519efb18c -rcc796564ee86ee3e7427d66c174fa4d407116f7b --- lams_tool_nb/db/sql/lams_tool_nb.sql (.../lams_tool_nb.sql) (revision 0fd3af4e71c48d1f797d0e809889e51519efb18c) +++ lams_tool_nb/db/sql/lams_tool_nb.sql (.../lams_tool_nb.sql) (revision cc796564ee86ee3e7427d66c174fa4d407116f7b) @@ -1,7 +1,7 @@ CREATE TABLE lams.tl_lanb11_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , nb_content_id BIGINT(20) UNIQUE NOT NULL - , title VARCHAR(255) + , title TEXT , content TEXT , online_instructions TEXT , offline_instructions TEXT @@ -26,3 +26,16 @@ REFERENCES lams.tl_lanb11_content (uid) )TYPE=InnoDB; +CREATE TABLE lams.tl_lanb11_user ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , user_id BIGINT(20) UNIQUE NOT NULL + , nb_session_uid BIGINT(20) NOT NULL + , username VARCHAR(50) + , fullname VARCHAR(50) + , user_status VARCHAR(50) + , PRIMARY KEY (uid) + , INDEX (nb_session_uid) + , CONSTRAINT FK_tl_lanb11_user_1 FOREIGN KEY (nb_session_uid) + REFERENCES lams.tl_lanb11_session (uid) +)TYPE=InnoDB; + Fisheye: Tag 0fd3af4e71c48d1f797d0e809889e51519efb18c refers to a dead (removed) revision in file `lams_tool_nb/db/sql/lams_tool_noticeboard.sql'. Fisheye: No comparison available. Pass `N' to diff?