Add support for SQL Server NVarchar (flowable#3909)

* Work in progress: to support differentiating between varchar/nvarchar (which is needed to improve sql server performance), all mappings need to get the correct type. For other databases, regular varchar is fine, hence why the typehandler is always the same for those databases * Nvarchar mappings for TimerJob * event subscription and cmmn engine updates * Nvarchar mappings for Execution * Nvarchar mappings for Batch * Nvarchar mappings for ExternalWorkerJob * Nvarchar mappings for ByteArray * cmmn engine updates * Nvarchar mappings for Job * cmmn engine updates * Nvarchar mappings for Property and Comment * cmmn engine updates * Nvarchar mappings for HistoricDetail and HistoricTaskInstance * cmmn engine updates * cmmn engine updates * cmmn engine updates * Nvarchar mappings for HistoricProcessInstance and Resource * Nvarchar mappings for Model and ProcessDefinitionInfo * Simplify nvarchar test * Nvarchar mappings for Model and HistoricEntityLink * cmmn engine updates * Nvarchar mappings for VariableInstance * cmmn engine updates * Nvarchar mappings for HistoricActivityInstance * Nvarchar mappings for DMN * App engine nvarchar changes * Comment out varchar to nvarchar changes * IDM nvarchar changes * event registry updates * fixes --------- Co-authored-by: Joram Barrez <[email protected]>
dbmalkovsky · Jun 12, 2024 · 70a5290 · 70a5290
1 parent 03d8680
commit 70a5290
Show file tree

Hide file tree

Showing 68 changed files with 7,458 additions and 5,177 deletions.
diff --git a/...owable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDefinition.xml b/...owable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDefinition.xml
@@ -62,18 +62,18 @@
   </update>
 
   <delete id="deleteAppDefinition" parameterType="org.flowable.app.engine.impl.persistence.entity.AppDefinitionEntityImpl">
-    delete from ${prefix}ACT_APP_APPDEF where ID_ = #{id}
+    delete from ${prefix}ACT_APP_APPDEF where ID_ = #{id, jdbcType=VARCHAR}
   </delete>  
 
   <delete id="deleteAppDefinitionsByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_APP_APPDEF where DEPLOYMENT_ID_ = #{deploymenId} 
+    delete from ${prefix}ACT_APP_APPDEF where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
   </delete>
 
   <resultMap id="appDefinitionResultMap" type="org.flowable.app.engine.impl.persistence.entity.AppDefinitionEntityImpl">
     <id property="id" column="ID_" jdbcType="VARCHAR" />
-    <result property="revision" column="REV_" />
-    <result property="category" column="CATEGORY_" />
-    <result property="name" column="NAME_" />
+    <result property="revision" column="REV_" jdbcType="INTEGER"/>
+    <result property="category" column="CATEGORY_" jdbcType="VARCHAR"/>
+    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
     <result property="key" column="KEY_" jdbcType="VARCHAR" />
     <result property="version" column="VERSION_" jdbcType="INTEGER"/>
     <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR" />
@@ -89,51 +89,51 @@
   </select>
 
   <select id="selectAppDefinitionById" parameterType="string" resultMap="appDefinitionResultMap">
-    select * from ${prefix}ACT_APP_APPDEF where ID_ = #{appDefinitionId}
+    select * from ${prefix}ACT_APP_APPDEF where ID_ = #{appDefinitionId, jdbcType=VARCHAR}
   </select>
 
   <select id="selectAppDefinitionByDeploymentAndKey" parameterType="map" resultMap="appDefinitionResultMap">
     select * 
     from ${prefix}ACT_APP_APPDEF 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{appDefinitionKey}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{appDefinitionKey, jdbcType=VARCHAR}
       and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
 
    <select id="selectAppDefinitionByDeploymentAndKeyAndTenantId" parameterType="map" resultMap="appDefinitionResultMap">
     select * 
     from ${prefix}ACT_APP_APPDEF 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-      and KEY_ = #{appDefinitionKey}
-      and TENANT_ID_ = #{tenantId}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+      and KEY_ = #{appDefinitionKey, jdbcType=VARCHAR}
+      and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
   </select>
 
   <select id="selectAppDefinitionsByKeyAndVersion" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="appDefinitionResultMap">
     select *
     from ${prefix}ACT_APP_APPDEF 
-    where KEY_ = #{parameter.appDefinitionKey} and VERSION_ = #{parameter.appDefinitionVersion} and (TENANT_ID_ = '' or TENANT_ID_ is null)
+    where KEY_ = #{parameter.appDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.appDefinitionVersion, jdbcType=INTEGER} and (TENANT_ID_ = '' or TENANT_ID_ is null)
   </select>
 
   <select id="selectAppDefinitionsByKeyAndVersionAndTenantId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="appDefinitionResultMap">
     select *
     from ${prefix}ACT_APP_APPDEF 
-    where KEY_ = #{parameter.appDefinitionKey} and VERSION_ = #{parameter.appDefinitionVersion} and TENANT_ID_ = #{parameter.tenantId}
+    where KEY_ = #{parameter.appDefinitionKey, jdbcType=VARCHAR} and VERSION_ = #{parameter.appDefinitionVersion, jdbcType=INTEGER} and TENANT_ID_ = #{parameter.tenantId, jdbcType=VARCHAR}
   </select>
 
   <select id="selectLatestAppDefinitionByKey" parameterType="string" resultMap="appDefinitionResultMap">
     select *
     from ${prefix}ACT_APP_APPDEF 
-    where KEY_ = #{key} and
+    where KEY_ = #{key, jdbcType=VARCHAR} and
           (TENANT_ID_ = ''  or TENANT_ID_ is null) and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = #{appDefinitionKey} and (TENANT_ID_ = '' or TENANT_ID_ is null))
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = #{appDefinitionKey, jdbcType=VARCHAR} and (TENANT_ID_ = '' or TENANT_ID_ is null))
   </select>
 
   <select id="selectLatestAppDefinitionByKeyAndTenantId" parameterType="map" resultMap="appDefinitionResultMap">
     select *
     from ${prefix}ACT_APP_APPDEF 
-    where KEY_ = #{appDefinitionKey} and
-          TENANT_ID_ = #{tenantId} and
-          VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = #{appDefinitionKey} and TENANT_ID_ = #{tenantId})
+    where KEY_ = #{appDefinitionKey, jdbcType=VARCHAR} and
+          TENANT_ID_ = #{tenantId, jdbcType=VARCHAR} and
+          VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = #{appDefinitionKey, jdbcType=VARCHAR} and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR})
   </select>
 
   <select id="selectAppDefinitionsByQueryCriteria" parameterType="org.flowable.app.engine.impl.repository.AppDefinitionQueryImpl" resultMap="appDefinitionResultMap">
@@ -153,72 +153,72 @@
     from ${prefix}ACT_APP_APPDEF RES
     <where>
       <if test="id != null">
-        RES.ID_ = #{id}
+        RES.ID_ = #{id, jdbcType=VARCHAR}
       </if>
       <if test="ids != null and ids">
         and RES.ID_ in
-        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-          #{item}
+        <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+          #{id, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryLike != null">
-        and RES.CATEGORY_ like #{categoryLike}${wildcardEscapeClause}
+        and RES.CATEGORY_ like #{categoryLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="keyLike != null">
-        and RES.KEY_ like #{keyLike}${wildcardEscapeClause}
+        and RES.KEY_ like #{keyLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="resourceName != null">
-        and RES.RESOURCE_NAME_ = #{resourceName}
+        and RES.RESOURCE_NAME_ = #{resourceName, jdbcType=VARCHAR}
       </if>
       <if test="resourceNameLike != null">
-        and RES.RESOURCE_NAME_ like #{resourceNameLike}${wildcardEscapeClause}
+        and RES.RESOURCE_NAME_ like #{resourceNameLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="version != null">
-        and RES.VERSION_ = #{version}
+        and RES.VERSION_ = #{version, jdbcType=INTEGER}
       </if>
       <if test="versionGt != null">
-        and RES.VERSION_ &gt; #{versionGt}
+        and RES.VERSION_ &gt; #{versionGt, jdbcType=INTEGER}
       </if>
       <if test="versionGte != null">
-        and RES.VERSION_ &gt;= #{versionGte}
+        and RES.VERSION_ &gt;= #{versionGte, jdbcType=INTEGER}
       </if>
       <if test="versionLt != null">
-        and RES.VERSION_ &lt; #{versionLt}
+        and RES.VERSION_ &lt; #{versionLt, jdbcType=INTEGER}
       </if>
       <if test="versionLte != null">
-        and RES.VERSION_ &lt;= #{versionLte}
+        and RES.VERSION_ &lt;= #{versionLte, jdbcType=INTEGER}
       </if>
       <if test="deploymentId != null">
-        and RES.DEPLOYMENT_ID_ = #{deploymentId}
+        and RES.DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null and !deploymentIds.empty">
         and RES.DEPLOYMENT_ID_ in
-        <foreach item="item" index="index" collection="deploymentIds" open="(" separator="," close=")">
-          #{item}
+        <foreach item="deploymentId" index="index" collection="deploymentIds" open="(" separator="," close=")">
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="latest">
         and RES.VERSION_ = (select max(VERSION_) from ${prefix}ACT_APP_APPDEF where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-               and TENANT_ID_ = #{tenantId}
+               and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
              </if>
              <if test="tenantIdLike != null">
-               and TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+               and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
              </if>
              <if test="withoutTenantId">
                and (TENANT_ID_ = '' or TENANT_ID_ is null)
@@ -229,10 +229,10 @@
         )
       </if>
        <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)

diff --git a/...owable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDeployment.xml b/...owable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppDeployment.xml
@@ -70,7 +70,7 @@
   <!-- DEPLOYMENT DELETE -->
 
   <delete id="deleteAppDeployment" parameterType="string">
-    delete from ${prefix}ACT_APP_DEPLOYMENT where ID_ = #{id}
+    delete from ${prefix}ACT_APP_DEPLOYMENT where ID_ = #{id, jdbcType=VARCHAR}
   </delete>
 
   <!-- DEPLOYMENT RESULTMAP -->
@@ -87,7 +87,7 @@
   <!-- DEPLOYMENT SELECT -->
 
   <select id="selectAppDeploymentsByName" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="appDeploymentResultMap">
-    select * from ${prefix}ACT_APP_DEPLOYMENT D where NAME_=#{parameter} order by D.DEPLOY_TIME_ desc
+    select * from ${prefix}ACT_APP_DEPLOYMENT D where NAME_=#{parameter, jdbcType=VARCHAR} order by D.DEPLOY_TIME_ desc
   </select>
 
   <select id="selectAppDeployment" parameterType="string" resultMap="appDeploymentResultMap">
@@ -111,46 +111,46 @@
     from ${prefix}ACT_APP_DEPLOYMENT RES
     <where>
       <if test="deploymentId != null">
-        RES.ID_ = #{deploymentId}
+        RES.ID_ = #{deploymentId, jdbcType=VARCHAR}
       </if>
       <if test="deploymentIds != null &amp;&amp; !deploymentIds.empty">
         and RES.ID_ IN
         <foreach item="deploymentId" index="index" collection="deploymentIds" 
                  open="(" separator="," close=")">
-          #{deploymentId}
+          #{deploymentId, jdbcType=VARCHAR}
         </foreach>
       </if>
       <if test="name != null">
-        and RES.NAME_ = #{name}
+        and RES.NAME_ = #{name, jdbcType=VARCHAR}
       </if>
       <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}
+        and RES.NAME_ like #{nameLike, jdbcType=VARCHAR}
       </if>
       <if test="category != null">
-        and RES.CATEGORY_ = #{category}
+        and RES.CATEGORY_ = #{category, jdbcType=VARCHAR}
       </if>
       <if test="categoryNotEquals != null">
-        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals} OR RES.CATEGORY_ is null )  
+        and ( RES.CATEGORY_ &lt;&gt; #{categoryNotEquals, jdbcType=VARCHAR} OR RES.CATEGORY_ is null )
       </if>
       <if test="key != null">
-        and RES.KEY_ = #{key}
+        and RES.KEY_ = #{key, jdbcType=VARCHAR}
       </if>
       <if test="withoutTenantId">
         and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
       </if>
       <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
+        and RES.TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
       </if>
       <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}
+        and RES.TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}
       </if>
       <if test="latest">
         and RES.DEPLOY_TIME_ = (select max(DEPLOY_TIME_) from ${prefix}ACT_APP_DEPLOYMENT where KEY_ = RES.KEY_ 
              <if test="tenantId != null">
-               and TENANT_ID_ = #{tenantId}
+               and TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
              </if>
              <if test="tenantIdLike != null">
-               and TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
+               and TENANT_ID_ like #{tenantIdLike, jdbcType=VARCHAR}${wildcardEscapeClause}
              </if>
         )
       </if>

diff --git a/...flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppResource.xml b/...flowable-app-engine/src/main/resources/org/flowable/app/db/mapping/entity/AppResource.xml
@@ -36,7 +36,7 @@
   <!-- RESOURCE DELETE -->
 
   <delete id="deleteAppResourcesByDeploymentId" parameterType="string">
-    delete from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{id}
+    delete from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{id, jdbcType=VARCHAR}
   </delete>
 
   <!-- RESOURCE RESULTMAP -->
@@ -51,17 +51,17 @@
   <!-- RESOURCE SELECT -->
 
   <select id="selectAppResourceNamesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultType="string">
-    select NAME_ from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select NAME_ from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>
 
   <select id="selectAppResourceByDeploymentIdAndResourceName" parameterType="map" resultMap="appResourceResultMap">
     select * from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE 
-    where DEPLOYMENT_ID_ = #{deploymentId}
-          AND NAME_ = #{resourceName}
+    where DEPLOYMENT_ID_ = #{deploymentId, jdbcType=VARCHAR}
+          AND NAME_ = #{resourceName, jdbcType=VARCHAR}
   </select>
 
   <select id="selectAppResourcesByDeploymentId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="appResourceResultMap">
-    select * from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter} order by NAME_ asc
+    select * from ${prefix}ACT_APP_DEPLOYMENT_RESOURCE where DEPLOYMENT_ID_ = #{parameter, jdbcType=VARCHAR} order by NAME_ asc
   </select>
 
   <update id="updateAppResource" parameterType="org.flowable.app.engine.impl.persistence.entity.AppResourceEntityImpl">