This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 3f9dcd5 fix database is the mysql DB keyword. (#4295)
3f9dcd5 is described below
commit 3f9dcd5d4489197b22027d752e2c0bd0d453c30c
Author: zhuangchong <[email protected]>
AuthorDate: Thu Dec 24 09:20:58 2020 +0800
fix database is the mysql DB keyword. (#4295)
---
.../dolphinscheduler/dao/mapper/UdfFuncMapper.xml | 99 +++++++++++++---------
1 file changed, 58 insertions(+), 41 deletions(-)
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
index ae8e0df..445810d 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml
@@ -18,82 +18,97 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"; >
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper">
+
+ <sql id="baseSql">
+ ${alias}.id, ${alias}.user_id, ${alias}.func_name,
${alias}.class_name, ${alias}.type, ${alias}.arg_types,
+ ${alias}.database, ${alias}.description, ${alias}.resource_id,
${alias}.resource_name, ${alias}.create_time, ${alias}.update_time
+ </sql>
+
<select id="selectUdfById"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
select
- id, user_id, func_name, class_name, type, arg_types,
- database, description, resource_id, resource_name, create_time,
update_time
- from t_ds_udfs
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf
where id = #{id}
</select>
<select id="queryUdfByIdStr"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
select
- id, user_id, func_name, class_name, type, arg_types,
- database, description, resource_id, resource_name, create_time,
update_time
- from t_ds_udfs
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf
where 1 = 1
<if test="ids != null and ids != ''">
- and id in
+ and udf.id in
<foreach collection="ids" item="i" open="(" close=")"
separator=",">
#{i}
</foreach>
</if>
<if test="funcNames != null and funcNames != ''">
- and func_name = #{funcNames}
+ and udf.func_name = #{funcNames}
</if>
- order by id asc
+ order by udf.id asc
</select>
<select id="queryUdfFuncPaging"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
- select id, user_id, func_name, class_name, type, arg_types, database,
description, resource_id, resource_name, create_time, update_time
- from t_ds_udfs
+ select
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf
where 1=1
<if test="searchVal!= null and searchVal != ''">
- and func_name like concat('%', #{searchVal}, '%')
+ and udf.func_name like concat('%', #{searchVal}, '%')
</if>
<if test="userId != 0">
- and id in (
+ and udf.id in (
select udf_id from t_ds_relation_udfs_user where user_id=#{userId}
union select id as udf_id from t_ds_udfs where user_id=#{userId})
</if>
- order by create_time desc
+ order by udf.create_time desc
</select>
<select id="getUdfFuncByType"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
select
- id, user_id, func_name, class_name, type, arg_types,
- database, description, resource_id, resource_name, create_time,
update_time
- from t_ds_udfs
- where type=#{type}
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf
+ where udf.type=#{type}
<if test="userId != 0">
- and id in (
+ and udf.id in (
select udf_id from t_ds_relation_udfs_user where user_id=#{userId}
union select id as udf_id from t_ds_udfs where user_id=#{userId})
</if>
</select>
<select id="queryUdfFuncExceptUserId"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
select
- id, user_id, func_name, class_name, type, arg_types,
- database, description, resource_id, resource_name, create_time,
update_time
- from t_ds_udfs
- where user_id <![CDATA[ <> ]]> #{userId}
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf
+ where udf.user_id <![CDATA[ <> ]]> #{userId}
</select>
<select id="queryAuthedUdfFunc"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
SELECT
- u.id, u.user_id, u.func_name, u.class_name, u.type, u.arg_types,
- u.database, u.description, u.resource_id, u.resource_name,
u.create_time, u.update_time
- from t_ds_udfs u,t_ds_relation_udfs_user rel
- WHERE u.id = rel.udf_id
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf,t_ds_relation_udfs_user rel
+ WHERE udf.id = rel.udf_id
AND rel.user_id = #{userId}
</select>
<select id="listAuthorizedUdfFunc"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
select
- u.id, u.user_id, u.func_name, u.class_name, u.type, u.arg_types,
- u.database, u.description, u.resource_id, u.resource_name,
u.create_time, u.update_time
- from t_ds_udfs u
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf
where
- id in (select udf_id from t_ds_relation_udfs_user where
user_id=#{userId}
+ udf.id in (select udf_id from t_ds_relation_udfs_user where
user_id=#{userId}
union select id as udf_id from t_ds_udfs where user_id=#{userId})
<if test="udfIds != null and udfIds != ''">
- and id in
+ and udf.id in
<foreach collection="udfIds" item="i" open="(" close=")"
separator=",">
#{i}
</foreach>
@@ -101,12 +116,13 @@
</select>
<select id="listUdfByResourceId"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
select
- u.id, u.user_id, u.func_name, u.class_name, u.type, u.arg_types,
- u.database, u.description, u.resource_id, u.resource_name,
u.create_time, u.update_time
- from t_ds_udfs u
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf
where 1=1
<if test="resourceIds != null and resourceIds != ''">
- and resource_id in
+ and udf.resource_id in
<foreach collection="resourceIds" item="i" open="(" close=")"
separator=",">
#{i}
</foreach>
@@ -114,14 +130,15 @@
</select>
<select id="listAuthorizedUdfByResourceId"
resultType="org.apache.dolphinscheduler.dao.entity.UdfFunc">
select
- u.id, u.user_id, u.func_name, u.class_name, u.type, u.arg_types,
- u.database, u.description, u.resource_id, u.resource_name,
u.create_time, u.update_time
- from t_ds_udfs u
+ <include refid="baseSql">
+ <property name="alias" value="udf"/>
+ </include>
+ from t_ds_udfs udf
where
- id in (select udf_id from t_ds_relation_udfs_user where
user_id=#{userId}
+ udf.id in (select udf_id from t_ds_relation_udfs_user where
user_id=#{userId}
union select id as udf_id from t_ds_udfs where user_id=#{userId})
<if test="resourceIds != null and resourceIds != ''">
- and resource_id in
+ and udf.resource_id in
<foreach collection="resourceIds" item="i" open="(" close=")"
separator=",">
#{i}
</foreach>
