From c13d3743b41be9eb3737c169a4e8008d1db0ba26 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Thu, 18 Jul 2024 17:14:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.1.1):=20Oracle=20insertBatch=20?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/template/mapper/JobLogMessageMapper.xml  | 6 ++++--
 .../src/main/resources/template/mapper/JobSummaryMapper.xml | 6 ++++--
 .../src/main/resources/template/mapper/JobTaskMapper.xml    | 6 ++++--
 .../resources/template/mapper/RetryDeadLetterMapper.xml     | 6 ++++--
 .../main/resources/template/mapper/RetrySummaryMapper.xml   | 6 ++++--
 .../main/resources/template/mapper/RetryTaskLogMapper.xml   | 6 ++++--
 .../resources/template/mapper/RetryTaskLogMessageMapper.xml | 6 ++++--
 .../src/main/resources/template/mapper/RetryTaskMapper.xml  | 6 ++++--
 .../src/main/resources/template/mapper/ServerNodeMapper.xml | 6 ++++--
 9 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml
index 2a0c4cfa..f21a7502 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml
@@ -24,8 +24,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml
index 3a4f1aab..1b4aba04 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml
@@ -27,8 +27,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskMapper.xml
index 1840c931..322adb1b 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskMapper.xml
@@ -34,8 +34,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryDeadLetterMapper.xml
index a5c12b91..c1110270 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryDeadLetterMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryDeadLetterMapper.xml
@@ -26,8 +26,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetrySummaryMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetrySummaryMapper.xml
index 1957270e..934bad44 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetrySummaryMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetrySummaryMapper.xml
@@ -23,8 +23,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml
index 848e1f98..47f53e8f 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml
@@ -26,8 +26,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMessageMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMessageMapper.xml
index 61ab7340..cf6b4710 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMessageMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMessageMapper.xml
@@ -22,8 +22,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskMapper.xml
index 1185a606..8ca664f6 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskMapper.xml
@@ -29,8 +29,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>
diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/ServerNodeMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/ServerNodeMapper.xml
index 9f984b53..71c7e0eb 100644
--- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/ServerNodeMapper.xml
+++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/ServerNodeMapper.xml
@@ -24,8 +24,10 @@
             </foreach>
         </if>
         <if test="@com.aizuda.snailjob.template.datasource.utils.DbUtils@isOracle()">
-            <foreach collection="list" item="item" open="SELECT" separator="UNION ALL" close="FROM DUAL">
-                <include refid="insertBatch_Column_List" />
+            <foreach collection="list" item="item" separator="UNION ALL">
+                SELECT
+                    <include refid="insertBatch_Column_List" />
+                FROM DUAL
             </foreach>
         </if>
     </insert>