Index: lams_common/db/model/lams_11.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/model/lams_11.clay,v
diff -u -r1.9 -r1.10
--- lams_common/db/model/lams_11.clay	11 Jan 2005 02:39:24 -0000	1.9
+++ lams_common/db/model/lams_11.clay	13 Jan 2005 23:29:27 -0000	1.10
@@ -2194,6 +2194,19 @@
 <variant type-name-pattern="DATETIME"/>
 </data-type>
 </column>
+<column name="activity_id" alias="" remarks="" mandatory="true" column-size="20" decimal-digits="0" default-value="0" auto-increment="false">
+<column-description/>
+<data-type name="BIGINT" jdbc-type="-5" selected-variant-pattern="BIGINT(%n)">
+<variant type-name-pattern="BIGINT(%n)" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT(%n) ZEROFILL" precision-variable="%n" precision-min="0" precision-max="19"/>
+<variant type-name-pattern="BIGINT UNSIGNED"/>
+<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="BIGINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key name="PK_LAMS_LEARNER_PROGRESS" alias="" remarks="">
 <primary-key-description/>
@@ -2215,6 +2228,13 @@
 </foreign-key-figure>
 <foreign-key-column column-name="lesson_id" referenced-key-column-name="lesson_id"/>
 </foreign-key>
+<foreign-key name="FK_lams_learner_progress_3" alias="" remarks="" referenced-table-schema="DEFAULT_SCHEMA" referenced-table="lams_learning_activity" referenced-key="PRIMARY" on-update="" on-delete="" source-multiplicity="0..*" target-multiplicity="1" source-entity-role="" target-entity-role="" source-relationship-type="" target-relationship-type="">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="activity_id" referenced-key-column-name="activity_id"/>
+</foreign-key>
 </foreign-key-list>
 <index-list/>
 </table>
@@ -2503,7 +2523,7 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table name="lams_progress_current" alias="" remarks="">
+<table name="lams_progress_attempted" alias="" remarks="">
 <table-description/>
 <table-figure-bounds x="1327" y="979" width="-1" height="-1"/>
 <column-list>
@@ -2534,7 +2554,7 @@
 </data-type>
 </column>
 </column-list>
-<primary-key name="PK_LAMS_PROGRESS_CURRENT" alias="" remarks="">
+<primary-key name="PK_LAMS_PROGRESS_ATTEMPTED" alias="" remarks="">
 <primary-key-description/>
 <primary-key-column name="learner_progress_id"/>
 <primary-key-column name="activity_id"/>
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.12 -r1.13
--- lams_common/db/sql/create_lams_11_tables.sql	11 Jan 2005 02:39:16 -0000	1.12
+++ lams_common/db/sql/create_lams_11_tables.sql	13 Jan 2005 23:29:27 -0000	1.13
@@ -329,13 +329,17 @@
      , lesson_completed_flag TINYINT(1) NOT NULL DEFAULT 0
      , start_date_time DATETIME NOT NULL
      , finish_date_time DATETIME
+     , activity_id BIGINT(20) NOT NULL DEFAULT 0
      , 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 (activity_id)
+     , CONSTRAINT FK_lams_learner_progress_3 FOREIGN KEY (activity_id)
+                  REFERENCES lams_learning_activity (activity_id)
 )TYPE=InnoDB;
 
 CREATE TABLE lams_tool_session (
@@ -379,7 +383,7 @@
                   REFERENCES lams_learning_activity (activity_id)
 )TYPE=InnoDB;
 
-CREATE TABLE lams_progress_current (
+CREATE TABLE lams_progress_attempted (
        learner_progress_id BIGINT(20) NOT NULL
      , activity_id BIGINT(20) NOT NULL DEFAULT 0
      , PRIMARY KEY (learner_progress_id, activity_id)
Index: lams_common/db/sql/drop_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/drop_lams_11_tables.sql,v
diff -u -r1.5 -r1.6
--- lams_common/db/sql/drop_lams_11_tables.sql	11 Jan 2005 02:39:16 -0000	1.5
+++ lams_common/db/sql/drop_lams_11_tables.sql	13 Jan 2005 23:29:27 -0000	1.6
@@ -52,7 +52,7 @@
 DROP TABLE lams_tool_content;
 DROP TABLE lams_user_group;
 DROP TABLE lams_user_tool_session;
-DROP TABLE lams_progress_current;
+DROP TABLE lams_progress_attempted;
 DROP TABLE lams_progress_completed;
 DROP TABLE lams_user_organisation_role;
 DROP TABLE lams_tool_session;