Fix failing tests on sql server

flowable · Jun 14, 2024 · 542ca9a · 542ca9a
1 parent 70a5290
commit 542ca9a
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 45 deletions.
diff --git a/...b-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml b/...b-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml
@@ -7,7 +7,7 @@
     <resultMap id="jobResultMap" type="org.flowable.job.service.impl.persistence.entity.DeadLetterJobEntityImpl">
         <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
         <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
         <result property="exclusive" column="EXCLUSIVE_" jdbcType="BOOLEAN" />
         <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
@@ -91,7 +91,7 @@
             TENANT_ID_)
     values (#{id, jdbcType=NVARCHAR},
     		#{revision, jdbcType=INTEGER},
-    		#{category, jdbcType=NVARCHAR},
+    		#{category, jdbcType=VARCHAR},
             #{jobType, jdbcType=NVARCHAR},
             #{exclusive, jdbcType=BOOLEAN},
             #{executionId, jdbcType=NVARCHAR},
@@ -145,7 +145,7 @@
 	    <foreach collection="list" item="deadLetterJob" index="index" separator=",">
 	        (#{deadLetterJob.id, jdbcType=NVARCHAR},
 	         #{deadLetterJob.revision, jdbcType=INTEGER},
-	         #{deadLetterJob.category, jdbcType=NVARCHAR},
+	         #{deadLetterJob.category, jdbcType=VARCHAR},
 	         #{deadLetterJob.jobType, jdbcType=NVARCHAR},
 	         #{deadLetterJob.exclusive, jdbcType=BOOLEAN},
 	         #{deadLetterJob.executionId, jdbcType=NVARCHAR},
@@ -200,7 +200,7 @@
       		TENANT_ID_) VALUES
       		(#{deadLetterJob.id, jdbcType=NVARCHAR},
        		#{deadLetterJob.revision, jdbcType=INTEGER},
-       		#{deadLetterJob.category, jdbcType=NVARCHAR},
+       		#{deadLetterJob.category, jdbcType=VARCHAR},
        		#{deadLetterJob.jobType, jdbcType=NVARCHAR},
        		#{deadLetterJob.exclusive, jdbcType=BOOLEAN},
        		#{deadLetterJob.executionId, jdbcType=NVARCHAR},
@@ -276,10 +276,10 @@
                 and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
+                and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
                 and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
@@ -398,7 +398,7 @@
                 PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=NVARCHAR},
+                CATEGORY_ = #{category, jdbcType=VARCHAR},
             </if>
             <if test="originalPersistentState.elementId != elementId">
                 ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR},

diff --git a/...rvice/src/main/resources/org/flowable/job/service/db/mapping/entity/ExternalWorkerJob.xml b/...rvice/src/main/resources/org/flowable/job/service/db/mapping/entity/ExternalWorkerJob.xml
@@ -9,7 +9,7 @@
     <resultMap id="externalWorkerJobResultMap" type="org.flowable.job.service.impl.persistence.entity.ExternalWorkerJobEntityImpl">
         <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
         <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
         <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
         <result property="lockExpirationTime" column="LOCK_EXP_TIME_" jdbcType="TIMESTAMP" />
@@ -121,7 +121,7 @@
             <if test="parameter.enabledCategories">
                 and CATEGORY_ in
                 <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                    #{category, jdbcType=NVARCHAR}
+                    #{category, jdbcType=VARCHAR}
                 </foreach>
             </if>
         </where>
@@ -209,10 +209,10 @@
                 and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
+                and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
                 and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
@@ -381,7 +381,7 @@
         TENANT_ID_)
         values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{category, jdbcType=NVARCHAR},
+        #{category, jdbcType=VARCHAR},
         #{jobType, jdbcType=NVARCHAR},
         #{lockOwner, jdbcType=NVARCHAR},
         #{lockExpirationTime, jdbcType=TIMESTAMP},
@@ -441,7 +441,7 @@
         <foreach collection="list" item="externalWorkerJob" index="index" separator=",">
             (#{externalWorkerJob.id, jdbcType=NVARCHAR},
             #{externalWorkerJob.revision, jdbcType=INTEGER},
-            #{externalWorkerJob.category, jdbcType=NVARCHAR},
+            #{externalWorkerJob.category, jdbcType=VARCHAR},
             #{externalWorkerJob.jobType, jdbcType=NVARCHAR},
             #{externalWorkerJob.lockOwner, jdbcType=NVARCHAR},
             #{externalWorkerJob.lockExpirationTime, jdbcType=TIMESTAMP},
@@ -502,7 +502,7 @@
             TENANT_ID_) VALUES
             (#{externalWorkerJob.id, jdbcType=NVARCHAR},
             #{externalWorkerJob.revision, jdbcType=INTEGER},
-            #{externalWorkerJob.category, jdbcType=NVARCHAR},
+            #{externalWorkerJob.category, jdbcType=VARCHAR},
             #{externalWorkerJob.jobType, jdbcType=NVARCHAR},
             #{externalWorkerJob.lockOwner, jdbcType=NVARCHAR},
             #{externalWorkerJob.lockExpirationTime, jdbcType=TIMESTAMP},
@@ -544,7 +544,7 @@
                 LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=NVARCHAR},
+                CATEGORY_ = #{category, jdbcType=VARCHAR},
             </if>
             <if test="originalPersistentState.jobHandlerType != jobHandlerType">
                 HANDLER_TYPE_ = #{jobHandlerType, jdbcType=NVARCHAR},

diff --git a/...lowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml b/...lowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/Job.xml
@@ -9,7 +9,7 @@
     <resultMap id="jobResultMap" type="org.flowable.job.service.impl.persistence.entity.JobEntityImpl">
         <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
         <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
         <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
         <result property="lockExpirationTime" column="LOCK_EXP_TIME_" jdbcType="TIMESTAMP" />
@@ -65,7 +65,7 @@
             <if test="parameter.enabledCategories != null">
                 and CATEGORY_ in
                 <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                    #{category, jdbcType=NVARCHAR}
+                    #{category, jdbcType=VARCHAR}
                 </foreach>
             </if>
         </where>
@@ -88,7 +88,7 @@
             <if test="parameter.enabledCategories">
                 and CATEGORY_ in
                 <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                    #{category, jdbcType=NVARCHAR}
+                    #{category, jdbcType=VARCHAR}
                 </foreach>
             </if>
         </where>
@@ -170,10 +170,10 @@
                 and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
+                and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
                 and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
@@ -335,7 +335,7 @@
         TENANT_ID_)
         values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{category, jdbcType=NVARCHAR},
+        #{category, jdbcType=VARCHAR},
         #{jobType, jdbcType=NVARCHAR},
         #{lockOwner, jdbcType=NVARCHAR},
         #{lockExpirationTime, jdbcType=TIMESTAMP},
@@ -395,7 +395,7 @@
         <foreach collection="list" item="job" index="index" separator=",">
             (#{job.id, jdbcType=NVARCHAR},
             #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=NVARCHAR},
+            #{job.category, jdbcType=VARCHAR},
             #{job.jobType, jdbcType=NVARCHAR},
             #{job.lockOwner, jdbcType=NVARCHAR},
             #{job.lockExpirationTime, jdbcType=TIMESTAMP},
@@ -456,7 +456,7 @@
             TENANT_ID_) VALUES
             (#{job.id, jdbcType=NVARCHAR},
             #{job.revision, jdbcType=INTEGER},
-            #{job.category, jdbcType=NVARCHAR},
+            #{job.category, jdbcType=VARCHAR},
             #{job.jobType, jdbcType=NVARCHAR},
             #{job.lockOwner, jdbcType=NVARCHAR},
             #{job.lockExpirationTime, jdbcType=TIMESTAMP},
@@ -498,7 +498,7 @@
                 LOCK_OWNER_ = #{lockOwner, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=NVARCHAR},
+                CATEGORY_ = #{category, jdbcType=VARCHAR},
             </if>
             <if test="originalPersistentState.jobHandlerType != jobHandlerType">
                 HANDLER_TYPE_ = #{jobHandlerType, jdbcType=NVARCHAR},

diff --git a/...ob-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml b/...ob-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml
@@ -7,7 +7,7 @@
     <resultMap id="jobResultMap" type="org.flowable.job.service.impl.persistence.entity.SuspendedJobEntityImpl">
         <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
         <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
         <result property="exclusive" column="EXCLUSIVE_" jdbcType="BOOLEAN" />
         <result property="executionId" column="EXECUTION_ID_" jdbcType="NVARCHAR" />
@@ -94,7 +94,7 @@
         TENANT_ID_)
         values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{category, jdbcType=NVARCHAR},
+        #{category, jdbcType=VARCHAR},
         #{jobType, jdbcType=NVARCHAR},
         #{exclusive, jdbcType=BOOLEAN},
         #{executionId, jdbcType=NVARCHAR},
@@ -150,7 +150,7 @@
         <foreach collection="list" item="suspendedJob" index="index" separator=",">
             (#{suspendedJob.id, jdbcType=NVARCHAR},
             #{suspendedJob.revision, jdbcType=INTEGER},
-            #{suspendedJob.category, jdbcType=NVARCHAR},
+            #{suspendedJob.category, jdbcType=VARCHAR},
             #{suspendedJob.jobType, jdbcType=NVARCHAR},
             #{suspendedJob.exclusive, jdbcType=BOOLEAN},
             #{suspendedJob.executionId, jdbcType=NVARCHAR},
@@ -207,7 +207,7 @@
             TENANT_ID_) VALUES
             (#{suspendedJob.id, jdbcType=NVARCHAR},
             #{suspendedJob.revision, jdbcType=INTEGER},
-            #{suspendedJob.category, jdbcType=NVARCHAR},
+            #{suspendedJob.category, jdbcType=VARCHAR},
             #{suspendedJob.jobType, jdbcType=NVARCHAR},
             #{suspendedJob.exclusive, jdbcType=BOOLEAN},
             #{suspendedJob.executionId, jdbcType=NVARCHAR},
@@ -284,10 +284,10 @@
                 and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
+                and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
                 and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
@@ -407,7 +407,7 @@
                 PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=NVARCHAR},
+                CATEGORY_ = #{category, jdbcType=VARCHAR},
             </if>
             <if test="originalPersistentState.elementId != elementId">
                 ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR},

diff --git a/...le-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml b/...le-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/TimerJob.xml
@@ -9,7 +9,7 @@
     <resultMap id="jobResultMap" type="org.flowable.job.service.impl.persistence.entity.TimerJobEntityImpl">
         <id property="id" column="ID_" jdbcType="NVARCHAR" />
         <result property="revision" column="REV_" jdbcType="INTEGER" />
-        <result property="category" column="CATEGORY_" jdbcType="NVARCHAR" />
+        <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
         <result property="jobType" column="TYPE_" jdbcType="NVARCHAR" />
         <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
         <result property="lockExpirationTime" column="LOCK_EXP_TIME_" jdbcType="TIMESTAMP" />
@@ -98,10 +98,10 @@
                 and RES.PROC_DEF_ID_ IN (select DEF.ID_ from ${prefix}ACT_RE_PROCDEF DEF where DEF.KEY_ = #{processDefinitionKey, jdbcType=NVARCHAR})
             </if>
             <if test="category != null">
-                and RES.CATEGORY_ = #{category, jdbcType=NVARCHAR}
+                and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
             </if>
             <if test="categoryLike != null">
-                and RES.CATEGORY_ like #{categoryLike, jdbcType=NVARCHAR}${wildcardEscapeClause}
+                and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}${wildcardEscapeClause}
             </if>
             <if test="elementId != null">
                 and RES.ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR}
@@ -188,7 +188,7 @@
         <if test="parameter.enabledCategories != null">
             and CATEGORY_ in
             <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                #{category, jdbcType=NVARCHAR}
+                #{category, jdbcType=VARCHAR}
             </foreach>
         </if>
         ${orderBy}
@@ -211,7 +211,7 @@
             <if test="parameter.enabledCategories">
                 and CATEGORY_ in
                 <foreach item="category" index="index" collection="parameter.enabledCategories" open="(" separator="," close=")">
-                    #{category, jdbcType=NVARCHAR}
+                    #{category, jdbcType=VARCHAR}
                 </foreach>
             </if>
         </where>
@@ -250,7 +250,7 @@
         TENANT_ID_)
         values (#{id, jdbcType=NVARCHAR},
         #{revision, jdbcType=INTEGER},
-        #{category, jdbcType=NVARCHAR},
+        #{category, jdbcType=VARCHAR},
         #{jobType, jdbcType=NVARCHAR},
         #{exclusive, jdbcType=BOOLEAN},
         #{executionId, jdbcType=NVARCHAR},
@@ -306,7 +306,7 @@
         <foreach collection="list" item="timerJob" index="index" separator=",">
             (#{timerJob.id, jdbcType=NVARCHAR},
             #{timerJob.revision, jdbcType=INTEGER},
-            #{timerJob.category, jdbcType=NVARCHAR},
+            #{timerJob.category, jdbcType=VARCHAR},
             #{timerJob.jobType, jdbcType=NVARCHAR},
             #{timerJob.exclusive, jdbcType=BOOLEAN},
             #{timerJob.executionId, jdbcType=NVARCHAR},
@@ -363,7 +363,7 @@
             TENANT_ID_) VALUES
             (#{timerJob.id, jdbcType=NVARCHAR},
             #{timerJob.revision, jdbcType=INTEGER},
-            #{timerJob.category, jdbcType=NVARCHAR},
+            #{timerJob.category, jdbcType=VARCHAR},
             #{timerJob.jobType, jdbcType=NVARCHAR},
             #{timerJob.exclusive, jdbcType=BOOLEAN},
             #{timerJob.executionId, jdbcType=NVARCHAR},
@@ -407,7 +407,7 @@
                 PROC_DEF_ID_ = #{processDefinitionId, jdbcType=NVARCHAR},
             </if>
             <if test="originalPersistentState.category != category">
-                CATEGORY_ = #{category, jdbcType=NVARCHAR},
+                CATEGORY_ = #{category, jdbcType=VARCHAR},
             </if>
             <if test="originalPersistentState.elementId != elementId">
                 ELEMENT_ID_ = #{elementId, jdbcType=NVARCHAR},