Browse Source

resole verify udf name error and delete udf error (#1024)

* rename from DatasourceUserMapper to DataSourceUserMapper

* add unit test in UserMapper and WorkerGroupMapper

* change cn.escheduler to org.apache.dolphinscheduler

* add unit test in UdfFuncMapperTest

* add unit test in UdfFuncMapperTest

* remove DatabaseConfiguration

* add ConnectionFactoryTest

* cal duration in processInstancesList

* change desc to description

* change table name in mysql ddl

* change table name in mysql ddl

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* remove log4j-1.2-api and modify AlertMapperTest

* remove log4j-1.2-api

* Add alertDao to spring management

* Add alertDao to spring management

* get SqlSessionFactory from MybatisSqlSessionFactoryBean

* get processDao by DaoFactory

* read druid properties in ConneciontFactory

* read druid properties in ConneciontFactory

* change get alertDao by spring to DaoFactory

* add log4j to resolve #967

* resole verify udf name error and delete udf error
pull/2/head
lgcareer 5 years ago committed by qiaozhanwei
parent
commit
3e46a30e12
  1. 2
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java
  2. 2
      dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml

2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java

@ -297,7 +297,7 @@ public class UdfFuncService extends BaseService{
*
* @param id
*/
@Transactional(value = "TransactionManager", rollbackFor = Exception.class)
@Transactional(value = "transactionManager",rollbackFor = Exception.class)
public Result delete(int id) {
Result result = new Result();

2
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml

@ -12,7 +12,7 @@
</foreach>
</if>
<if test="funcNames != null and funcNames != ''">
and func_name = #{funcName}
and func_name = #{funcNames}
</if>
order by id asc
</select>

Loading…
Cancel
Save