Index: lams_tool_survey/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/table-schema.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/db/sql/table-schema.sql	14 Sep 2006 06:44:13 -0000	1.3
+++ lams_tool_survey/db/sql/table-schema.sql	21 Sep 2006 07:46:41 -0000	1.4
@@ -1,5 +1,5 @@
 alter table tl_lasurv11_answer drop foreign key FK6DAAFE3BB1423DC1;
-alter table tl_lasurv11_answer drop foreign key FK6DAAFE3BAE4CB69;
+alter table tl_lasurv11_answer drop foreign key FK6DAAFE3B25F3BB77;
 alter table tl_lasurv11_attachment drop foreign key FKD92A9120D14146E5;
 alter table tl_lasurv11_option drop foreign key FK85AB46F26966134F;
 alter table tl_lasurv11_question drop foreign key FK872D4F23D14146E5;
@@ -15,15 +15,15 @@
 drop table if exists tl_lasurv11_session;
 drop table if exists tl_lasurv11_survey;
 drop table if exists tl_lasurv11_user;
-create table tl_lasurv11_answer (uid bigint not null auto_increment, survey_item_uid bigint, user_uid bigint, session_id bigint, answer_choices varchar(255), udpate_date datetime, answer_text varchar(255), primary key (uid));
+create table tl_lasurv11_answer (uid bigint not null auto_increment, question_uid bigint, user_uid bigint, answer_choices varchar(255), udpate_date datetime, answer_text varchar(255), primary key (uid));
 create table tl_lasurv11_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, survey_uid bigint, primary key (uid));
-create table tl_lasurv11_option (uid bigint not null auto_increment, description varchar(255), sequence_id integer, answer_uid bigint, primary key (uid));
-create table tl_lasurv11_question (uid bigint not null auto_increment, description varchar(255), create_by bigint, create_date datetime, question_type smallint, append_text bit, compulsory bit, max_answers integer, survey_uid bigint, primary key (uid));
+create table tl_lasurv11_option (uid bigint not null auto_increment, description text, sequence_id integer, answer_uid bigint, primary key (uid));
+create table tl_lasurv11_question (uid bigint not null auto_increment, description text, create_by bigint, create_date datetime, question_type smallint, append_text bit, optional bit, allow_multiple_answer bit, sequence_id integer, survey_uid bigint, primary key (uid));
 create table tl_lasurv11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, survey_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
 create table tl_lasurv11_survey (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, reflect_instructions varchar(255), reflect_on_activity bit, show_questions_on_one_page bit, primary key (uid));
 create table tl_lasurv11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, survey_uid bigint, session_finished bit, primary key (uid));
 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 FK6DAAFE3BAE4CB69 (survey_item_uid), add constraint FK6DAAFE3BAE4CB69 foreign key (survey_item_uid) references tl_lasurv11_question (uid);
+alter table tl_lasurv11_answer add index FK6DAAFE3B25F3BB77 (question_uid), add constraint FK6DAAFE3B25F3BB77 foreign key (question_uid) references tl_lasurv11_question (uid);
 alter table tl_lasurv11_attachment add index FKD92A9120D14146E5 (survey_uid), add constraint FKD92A9120D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid);
 alter table tl_lasurv11_option add index FK85AB46F26966134F (answer_uid), add constraint FK85AB46F26966134F foreign key (answer_uid) references tl_lasurv11_question (uid);
 alter table tl_lasurv11_question add index FK872D4F23D14146E5 (survey_uid), add constraint FK872D4F23D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid);