This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 1cbd17f0c Fix pg bug (#4807)
1cbd17f0c is described below
commit 1cbd17f0c81bd636b380f1a37e06aeb879b77a97
Author: sjgllgh <[email protected]>
AuthorDate: Tue Jul 25 10:50:10 2023 +0800
Fix pg bug (#4807)
* fix missing backtick in mysql keywords
* fix pg bug
---
.../mapper/{common => mysql}/EngineConnBmlResourceMapper.xml | 0
.../mapper/{common => postgresql}/EngineConnBmlResourceMapper.xml | 4 ++--
.../main/resources/mapper/postgresql/ECResourceRecordMapper.xml | 2 +-
.../resources/mapper/{common => mysql}/DatasourceAccessMapper.xml | 0
.../resources/mapper/{common => mysql}/DatasourceEnvMapper.xml | 0
.../resources/mapper/{common => mysql}/GatewayAuthTokenMapper.xml | 0
.../mapper/{common => mysql}/RmExternalResourceProviderMapper.xml | 0
.../main/resources/mapper/{common => mysql}/UdfManagerMapper.xml | 0
.../src/main/resources/mapper/{common => mysql}/UdfTreeMapper.xml | 0
.../mapper/{common => postgresql}/DatasourceAccessMapper.xml | 4 ++--
.../mapper/{common => postgresql}/DatasourceEnvMapper.xml | 6 +++---
.../main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml | 2 +-
.../src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml | 8 ++++----
.../mapper/{common => postgresql}/GatewayAuthTokenMapper.xml | 6 +++---
.../src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml | 8 ++++----
.../{common => postgresql}/RmExternalResourceProviderMapper.xml | 8 ++++----
.../resources/mapper/{common => postgresql}/UdfManagerMapper.xml | 2 +-
.../resources/mapper/{common => postgresql}/UdfTreeMapper.xml | 8 ++++----
.../src/main/resources/mapper/postgresql/contextMapMapper.xml | 6 +++---
.../main/resources/mapper/{common => mysql}/DataSouceMapper.xml | 0
.../resources/mapper/{common => mysql}/DataSourceEnvMapper.xml | 0
.../resources/mapper/{common => postgresql}/DataSouceMapper.xml | 2 +-
.../mapper/{common => postgresql}/DataSourceEnvMapper.xml | 2 +-
.../src/main/resources/mapper/postgresql/JobHistoryMapper.xml | 4 ++--
.../src/main/resources/mapper/postgresql/UDFDao.xml | 4 ++--
25 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/mysql/EngineConnBmlResourceMapper.xml
similarity index 100%
copy from
linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml
copy to
linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/mysql/EngineConnBmlResourceMapper.xml
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/postgresql/EngineConnBmlResourceMapper.xml
similarity index 99%
rename from
linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml
rename to
linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/postgresql/EngineConnBmlResourceMapper.xml
index cfc6cf017..acea50c6f 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/common/EngineConnBmlResourceMapper.xml
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/resources/mapper/postgresql/EngineConnBmlResourceMapper.xml
@@ -46,10 +46,10 @@
FROM linkis_cg_engine_conn_plugin_bml_resources
<where>
<if test="engineConnType != null and engineConnType != ''">
- AND engine_conn_type like concat('%', #{engineConnType}, '%')
+ AND engine_conn_type like concat('%', #{engineConnType}::text,
'%')
</if>
<if test="engineConnVersion != null and engineConnVersion != ''">
- AND version like concat('%', #{engineConnVersion}, '%')
+ AND version like concat('%', #{engineConnVersion}::text, '%')
</if>
</where>
ORDER BY create_time DESC
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/postgresql/ECResourceRecordMapper.xml
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/postgresql/ECResourceRecordMapper.xml
index 8bc13d23f..fdac44975 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/postgresql/ECResourceRecordMapper.xml
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/resources/mapper/postgresql/ECResourceRecordMapper.xml
@@ -87,7 +87,7 @@
<if test="instance != null">service_instance = #{instance}</if>
<if test="username != null">and create_user = #{username}</if>
<!-- label_value in db eg：`hadoop-spark,spark-3.2.1`-->
- <if test="engineType !=null">and label_value like
concat('%,',#{engineType},'%')</if>
+ <if test="engineType !=null">and label_value like
concat('%,',#{engineType}::text,'%')</if>
<if test="startDate != null">and create_time BETWEEN #{startDate}
AND #{endDate}</if>
</where>
ORDER BY linkis_cg_ec_resource_info_record.create_time DESC
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceAccessMapper.xml
similarity index 100%
copy from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml
copy to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceAccessMapper.xml
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceEnvMapper.xml
similarity index 100%
copy from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml
copy to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/DatasourceEnvMapper.xml
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/GatewayAuthTokenMapper.xml
similarity index 100%
copy from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml
copy to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/GatewayAuthTokenMapper.xml
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/RmExternalResourceProviderMapper.xml
similarity index 100%
copy from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml
copy to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/RmExternalResourceProviderMapper.xml
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfManagerMapper.xml
similarity index 100%
copy from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml
copy to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfManagerMapper.xml
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfTreeMapper.xml
similarity index 100%
copy from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml
copy to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/mysql/UdfTreeMapper.xml
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
similarity index 94%
rename from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml
rename to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
index fa62a5f0d..14a96f82b 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceAccessMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceAccessMapper.xml
@@ -42,8 +42,8 @@
<include refid="Base_Column_List"></include>
FROM linkis_ps_datasource_access
<if test="searchName != null and searchName!=''">
- WHERE visitor LIKE concat('%',#{searchName},'%')
- OR fields LIKE concat('%',#{searchName},'%')
+ WHERE visitor LIKE concat('%',#{searchName}::text,'%')
+ OR fields LIKE concat('%',#{searchName}::text,'%')
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
similarity index 92%
rename from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml
rename to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
index a3a6a2748..ecff96223 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/DatasourceEnvMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceEnvMapper.xml
@@ -43,9 +43,9 @@
<include refid="Base_Column_List"></include>
FROM linkis_ps_dm_datasource_env
<if test="searchName != null and searchName!=''">
- WHERE env_name LIKE concat('%',#{searchName},'%')
- OR env_desc LIKE concat('%',#{searchName},'%')
- OR parameter LIKE concat('%',#{searchName},'%')
+ WHERE env_name LIKE concat('%',#{searchName}::text,'%')
+ OR env_desc LIKE concat('%',#{searchName}::text,'%')
+ OR parameter LIKE concat('%',#{searchName}::text,'%')
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
index 0ee9730c6..479355664 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeKeyMapper.xml
@@ -55,7 +55,7 @@
from linkis_ps_dm_datasource_type_key
where 1 = 1
<if test="searchName != null and searchName!=''">
- and "name" like concat('%',#{searchName},'%')
+ and "name" like concat('%',#{searchName}::text,'%')
</if>
<if test="dataSourceTypeId != null and dataSourceTypeId!=''">
and "data_source_type_id" = #{dataSourceTypeId}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
index 01f38cc54..3aa09d5e6 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/DatasourceTypeMapper.xml
@@ -41,10 +41,10 @@
<include refid="Base_Column_List"></include>
from linkis_ps_dm_datasource_type
<if test="searchName != null and searchName!=''">
- WHERE "name" LIKE concat('%',#{searchName},'%')
- OR "description" LIKE concat('%',#{searchName},'%')
- OR "option" LIKE concat('%',#{searchName},'%')
- OR "classifier" LIKE concat('%',#{searchName},'%')
+ WHERE "name" LIKE concat('%',#{searchName}::text,'%')
+ OR "description" LIKE concat('%',#{searchName}::text,'%')
+ OR "option" LIKE concat('%',#{searchName}::text,'%')
+ OR "classifier" LIKE concat('%',#{searchName}::text,'%')
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
similarity index 91%
rename from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml
rename to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
index d187af707..80051880b 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/GatewayAuthTokenMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/GatewayAuthTokenMapper.xml
@@ -43,9 +43,9 @@
<include refid="Base_Column_List"></include>
FROM linkis_mg_gateway_auth_token
<if test="searchName != null and searchName!=''">
- WHERE token_name LIKE concat('%',#{searchName},'%')
- OR legal_users LIKE concat('%',#{searchName},'%')
- OR legal_hosts LIKE concat('%',#{searchName},'%')
+ WHERE token_name LIKE concat('%',#{searchName}::text,'%')
+ OR legal_users LIKE concat('%',#{searchName}::text,'%')
+ OR legal_hosts LIKE concat('%',#{searchName}::text,'%')
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
index cec7c7e9f..a0088e7d0 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/PsErrorCodeMapper.xml
@@ -38,10 +38,10 @@
<include refid="Base_Column_List"></include>
from linkis_ps_error_code
<if test="searchName != null and searchName!=''">
- where error_code like concat('%',#{searchName},'%')
- or error_desc like concat('%',#{searchName},'%')
- or error_regex like concat('%',#{searchName},'%')
- or error_type::text like concat('%',#{searchName},'%')
+ where error_code like concat('%',#{searchName}::text,'%')
+ or error_desc like concat('%',#{searchName}::text,'%')
+ or error_regex like concat('%',#{searchName}::text,'%')
+ or error_type::text like concat('%',#{searchName}::text,'%')
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
similarity index 88%
rename from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml
rename to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
index 78f62848a..b27c8dcd9 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/RmExternalResourceProviderMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/RmExternalResourceProviderMapper.xml
@@ -38,10 +38,10 @@
<include refid="Base_Column_List"></include>
FROM linkis_cg_rm_external_resource_provider
<if test="searchName != null and searchName!=''">
- WHERE resource_type LIKE concat('%',#{searchName},'%')
- OR name LIKE concat('%',#{searchName},'%')
- OR labels LIKE concat('%',#{searchName},'%')
- OR config LIKE concat('%',#{searchName},'%')
+ WHERE resource_type LIKE concat('%',#{searchName}::text,'%')
+ OR name LIKE concat('%',#{searchName}::text,'%')
+ OR labels LIKE concat('%',#{searchName}::text,'%')
+ OR config LIKE concat('%',#{searchName}::text,'%')
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
similarity index 95%
rename from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml
rename to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
index b0d31fe07..799243f9f 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfManagerMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfManagerMapper.xml
@@ -34,7 +34,7 @@
<include refid="Base_Column_List"></include>
FROM linkis_ps_udf_manager
<if test="searchName != null and searchName!=''">
- WHERE user_name LIKE concat('%',#{searchName},'%')
+ WHERE user_name LIKE concat('%',#{searchName}::text,'%')
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
similarity index 89%
rename from
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml
rename to
linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
index 7f95dd151..0a8422afe 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/common/UdfTreeMapper.xml
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/resources/mapper/postgresql/UdfTreeMapper.xml
@@ -42,10 +42,10 @@
<include refid="Base_Column_List"></include>
FROM linkis_ps_udf_tree
<if test="searchName != null and searchName!=''">
- WHERE user_name LIKE concat('%',#{searchName},'%')
- OR name LIKE concat('%',#{searchName},'%')
- OR description LIKE concat('%',#{searchName},'%')
- OR category LIKE concat('%',#{searchName},'%')
+ WHERE user_name LIKE concat('%',#{searchName}::text,'%')
+ OR name LIKE concat('%',#{searchName}::text,'%')
+ OR description LIKE concat('%',#{searchName}::text,'%')
+ OR category LIKE concat('%',#{searchName}::text,'%')
</if>
</select>
</mapper>
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
index f1c9794f6..d59e85825 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/postgresql/contextMapMapper.xml
@@ -64,7 +64,7 @@
</select>
<select id="getAllContextMapByKey" resultMap="PersistenceContextKeyValue">
- SELECT * FROM linkis_ps_cs_context_map WHERE context_id =
cast(#{contextID.contextId} as int) AND "key" LIKE CONCAT('%',#{key},'%')
+ SELECT * FROM linkis_ps_cs_context_map WHERE context_id =
cast(#{contextID.contextId} as int) AND "key" LIKE CONCAT('%',#{key}::text,'%')
</select>
@@ -120,7 +120,7 @@
<where>
<if test="#{contextID.contextId} !=null">context_id =
cast(#{contextID.contextId} as int) and </if>
<!--<if test="#{contextType} !=null">context_type = #{contextType}
and </if>-->
- <if test="#{keyPrefix} !=null">"key" like
concat(#{keyPrefix},'%')</if>
+ <if test="#{keyPrefix} !=null">"key" like
concat(#{keyPrefix}::text,'%')</if>
</where>
</delete>
<!--todo 和上面的合并sql-->
@@ -129,7 +129,7 @@
<where>
<if test="#{contextID.contextId} !=null">context_id =
cast(#{contextID.contextId} as int) and </if>
<if test="#{contextType} !=null">context_type = #{contextType} and
</if>
- <if test="#{keyPrefix} !=null">"key" like
concat(#{keyPrefix},'%')</if>
+ <if test="#{keyPrefix} !=null">"key" like
concat(#{keyPrefix}::text,'%')</if>
</where>
</delete>
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/mysql/DataSouceMapper.xml
similarity index 100%
copy from
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
copy to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/mysql/DataSouceMapper.xml
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/mysql/DataSourceEnvMapper.xml
similarity index 100%
copy from
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml
copy to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/mysql/DataSourceEnvMapper.xml
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSouceMapper.xml
similarity index 99%
rename from
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSouceMapper.xml
index 24425e4d5..88bd3c51b 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSouceMapper.xml
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSouceMapper.xml
@@ -236,7 +236,7 @@
INNER JOIN linkis_ps_dm_datasource d ON t.id = d.datasource_type_id
<where>
<if test="dataSourceName != null and dataSourceName != ''">
- AND datasource_name like concat('%', #{dataSourceName}, '%')
+ AND datasource_name like concat('%', #{dataSourceName}::text,
'%')
</if>
<if test="dataSourceTypeId != null and dataSourceTypeId > 0">
AND datasource_type_id = #{dataSourceTypeId}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSourceEnvMapper.xml
similarity index 98%
rename from
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml
rename to
linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSourceEnvMapper.xml
index 70cf5df00..3c02c7dfe 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/common/DataSourceEnvMapper.xml
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/resources/mapper/postgresql/DataSourceEnvMapper.xml
@@ -90,7 +90,7 @@
FROM linkis_ps_dm_datasource_env e
<where>
<if test="envName != null and envName != ''">
- e.env_name like concat('%', #{envName}, '%')
+ e.env_name like concat('%', #{envName}::text, '%')
</if>
<if test="dataSourceTypeId != null and dataSourceTypeId > 0">
AND e.datasource_type_id = #{dataSourceTypeId}
diff --git
a/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml
b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml
index cd4c3e056..30e4e85b3 100644
---
a/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml
+++
b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/postgresql/JobHistoryMapper.xml
@@ -133,7 +133,7 @@
<if test="startDate != null">and created_time >= #{startDate} AND
created_time <![CDATA[<=]]> #{endDate}</if>
<if test="status != null">and <foreach collection="status"
item="element" close=")" separator="," open="status in
(">#{element}</foreach></if>
<if test="userCreatorKey != null and creator != null">
- and labels like CONCAT('%"', #{userCreatorKey}, '":"%-',
#{creator}, '%')
+ and labels like CONCAT('%"', #{userCreatorKey}::text, '":"%-',
#{creator}::text, '%')
</if>
<if test="startId != null">and id >= #{startId}</if>
<if test="instances != null">and instances = #{instances}</if>
@@ -213,7 +213,7 @@
<if test="startDate != null">and created_time >= #{startDate} AND
created_time <![CDATA[<=]]> #{endDate}</if>
<if test="status != null">and <foreach collection="status"
item="element" close=")" separator="," open="status in
(">#{element}</foreach></if>
<if test="userCreatorKey != null and creator != null">
- and labels like CONCAT('%"', #{userCreatorKey}, '":"%-',
#{creator}, '%')
+ and labels like CONCAT('%"', #{userCreatorKey}::text, '":"%-',
#{creator}::text, '%')
</if>
</where>
</select>
diff --git
a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
index f4e6eca73..b32b42185 100644
---
a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
+++
b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/postgresql/UDFDao.xml
@@ -227,7 +227,7 @@
linkis_ps_udf_baseinfo b
on a.udf_id=b.id
where udf_type=0
- and b.path like CONCAT('%',#{arg1})
+ and b.path like CONCAT('%',#{arg1}::text)
</select>
<select id="getSameNameCountByUser" resultType="java.lang.Long" >
@@ -344,7 +344,7 @@
<where>
<if test="1 == 1">1 = 1</if>
<if test="createUser != null">and pu.create_user =
#{createUser}</if>
- <if test="udfName != null">and pu.udf_name like
CONCAT('%',#{udfName},'%')</if>
+ <if test="udfName != null">and pu.udf_name like
CONCAT('%',#{udfName}::text,'%')</if>
<if test="udfTypes != null">and pu.udf_type in
<foreach collection="udfTypes" open="(" close=")" item="item"
separator=",">
#{item}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
