diff --git a/workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql b/workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql index f7f9c8d85..d00b104a9 100644 --- a/workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql +++ b/workflow-engine-core/src/main/resources/sql/upgrade_to_130.sql @@ -6,7 +6,7 @@ insert into ext_ax_hi_taskinst (proc_inst_id, task_id, task_definition_key, stat select PROC_INST_ID_, ID_, TASK_DEF_KEY_, 'PROCESSING', ifnull(ASSIGNEE_, '') as ASSIGNEE_ from act_hi_taskinst where END_TIME_ is null - and ID_ not in (select distinct task_id from ext_ax_hi_taskinst) + and ID_ not in (select distinct task_id from ext_ax_hi_taskinst); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java index 4d3a5b3dd..eb2ec979d 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/initializer/VersionUpgradeInitializer.java @@ -58,9 +58,9 @@ public class VersionUpgradeInitializer implements ApplicationRunner { int current = Integer.parseInt(currentVersion.replace(".", "")); if (upgradeVersion > current) { newVersions.add(upgradeVersion); - log.debug("execute sql script: {}", i); try { executeSqlScript(i); + log.debug("execute sql script: {}", i); } catch (Exception e) { LogUtil.error(LogUtil.ErrorType.ERROR_SQL, "升级服务数据库版本发生异常,文件: {}, 异常信息: {}", i, e.getMessage()); result.compareAndSet(true, false); @@ -113,6 +113,7 @@ public class VersionUpgradeInitializer implements ApplicationRunner { // Split SQL statements and execute each one String[] sqlStatements = scriptBuilder.toString().split(";"); for (String sql : sqlStatements) { + log.info("sql: {}", sql); jdbcTemplate.execute(sql); } } catch (IOException e) {