ACT-688 Moved comments from ACT_HI_DETAIL to its own ACT_HI_COMMENT table

modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.history.sql

@@ -65,9 +65,20 @@ create table ACT_HI_DETAIL (
     primary key (ID_)
 );
 
+create table ACT_HI_COMMENT (
+    ID_ varchar(64) not null,
+    TIME_ timestamp not null,
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    MESSAGE_ varchar(255),
+    primary key (ID_)
+);
+
 create table ACT_HI_ATTACHMENT (
     ID_ varchar(64) not null,
     REV_ integer,
+    USER_ID_ varchar(255),
     NAME_ varchar(255),
     DESCRIPTION_ varchar(255),
     TYPE_ varchar(255),

modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.h2.drop.history.sql

@@ -14,4 +14,5 @@ drop table ACT_HI_PROCINST if exists;
 drop table ACT_HI_ACTINST if exists;
 drop table ACT_HI_TASKINST if exists;
 drop table ACT_HI_DETAIL if exists;
+drop table ACT_HI_COMMENT if exists;
 drop table ACT_HI_ATTACHMENT if exists;

modules/activiti-engine/src/main/resources/org/activiti/db/ibatis/history.mapping.xml

@@ -613,14 +613,13 @@
   </sql>
   
   <!-- COMMENT INSERT -->
-
+  
   <insert id="insertComment" parameterType="org.activiti.engine.impl.task.CommentEntity">
-    insert into ACT_HI_DETAIL (ID_, TYPE_, NAME_, TIME_, TASK_ID_, PROC_INST_ID_, TEXT_)
+    insert into ACT_HI_COMMENT (ID_, TIME_, USER_ID_, TASK_ID_, PROC_INST_ID_, MESSAGE_)
     values (
       #{id ,jdbcType=VARCHAR},
-      'comment',
-      #{userId ,jdbcType=VARCHAR},
       #{time ,jdbcType=TIMESTAMP},
+      #{userId ,jdbcType=VARCHAR},
       #{taskId ,jdbcType=VARCHAR},
       #{processInstanceId ,jdbcType=VARCHAR},
       #{message ,jdbcType=VARCHAR}
@@ -630,28 +629,28 @@
   <!-- COMMENT DELETE -->
 
   <delete id="deleteCommentsByTaskId" parameterType="string">
-    delete from ACT_HI_DETAIL where TASK_ID_ = #{taskId} 
+    delete from ACT_HI_COMMENT where TASK_ID_ = #{taskId} 
   </delete>
 
   <!-- COMMENT RESULTMAP -->
 
   <resultMap id="commentResultMap" type="org.activiti.engine.impl.task.CommentEntity">
     <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="userId" column="NAME_" jdbcType="VARCHAR" />
+    <result property="userId" column="USER_ID_" jdbcType="VARCHAR" />
     <result property="time" column="TIME_" jdbcType="TIMESTAMP" />
     <result property="taskId" column="TASK_ID_" jdbcType="VARCHAR" />
     <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="message" column="TEXT_" jdbcType="VARCHAR" />
+    <result property="message" column="MESSAGE_" jdbcType="VARCHAR" />
   </resultMap>
   
   <!-- COMMENT SELECT -->
 
   <select id="selectCommentsByTaskId" parameterType="string" resultMap="commentResultMap">
-    select * from ACT_HI_DETAIL where TASK_ID_ = #{taskId,jdbcType=VARCHAR}
+    select * from ACT_HI_COMMENT where TASK_ID_ = #{taskId,jdbcType=VARCHAR}
   </select>
 
   <select id="selectCommentsByProcessInstanceId" parameterType="string" resultMap="commentResultMap">
-    select * from ACT_HI_DETAIL where PROC_INST_ID_ = #{processInstanceId,jdbcType=VARCHAR}
+    select * from ACT_HI_COMMENT where PROC_INST_ID_ = #{processInstanceId,jdbcType=VARCHAR}
   </select>
 
   <!-- ATTACHMENT INSERT -->

modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.53.to.54.history.sql

 alter table ACT_HI_DETAIL 
 add DUE_DATE_ timestamp;
 
+create table ACT_HI_COMMENT (
+    ID_ varchar(64) not null,
+    TIME_ timestamp not null,
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    MESSAGE_ varchar(255),
+    primary key (ID_)
+);
+
 create table ACT_HI_ATTACHMENT (
     ID_ varchar(64) not null,
     REV_ integer,