Merge pull request #3422 from harawata/trimsqlnode-add-space

`TrimSqlNode` should add an extra space when concatenating its contents like `MixedSqlNode` does

Author: hazendaz

src/main/java/org/apache/ibatis/scripting/xmltags/TrimSqlNode.java

@@ -91,7 +91,7 @@ public FilteredDynamicContext(DynamicContext delegate) {
     public void applyAll() {
       sqlBuffer = new StringBuilder(sqlBuffer.toString().trim());
       String trimmedUppercaseSql = sqlBuffer.toString().toUpperCase(Locale.ENGLISH);
-      if (trimmedUppercaseSql.length() > 0) {
+      if (!trimmedUppercaseSql.isEmpty()) {
         applyPrefix(sqlBuffer, trimmedUppercaseSql);
         applySuffix(sqlBuffer, trimmedUppercaseSql);
       }
@@ -100,6 +100,9 @@ public void applyAll() {
 
     @Override
     public void appendSql(String sql) {
+      if (sqlBuffer.length() > 0) {
+        sqlBuffer.append(" ");
+      }
       sqlBuffer.append(sql);
     }
 

src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java

@@ -214,7 +214,7 @@ void shouldTrimWHEREInsteadOfORForSecondCondition() throws Exception {
 
   @Test
   void shouldTrimWHEREInsteadOfANDForBothConditions() throws Exception {
-    final String expected = "SELECT * FROM BLOG WHERE  ID = ?   OR NAME = ?";
+    final String expected = "SELECT * FROM BLOG WHERE  ID = ?    OR NAME = ?";
     DynamicSqlSource source = createDynamicSqlSource(new TextSqlNode("SELECT * FROM BLOG"),
         new WhereSqlNode(new Configuration(),
             mixedContents(new IfSqlNode(mixedContents(new TextSqlNode("   and ID = ?   ")), "true"),
@@ -236,7 +236,7 @@ void shouldTrimNoWhereClause() throws Exception {
 
   @Test
   void shouldTrimSETInsteadOfCOMMAForBothConditions() throws Exception {
-    final String expected = "UPDATE BLOG SET ID = ?,  NAME = ?";
+    final String expected = "UPDATE BLOG SET ID = ?,   NAME = ?";
     DynamicSqlSource source = createDynamicSqlSource(new TextSqlNode("UPDATE BLOG"),
         new SetSqlNode(new Configuration(),
             mixedContents(new IfSqlNode(mixedContents(new TextSqlNode(" ID = ?, ")), "true"),

src/test/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilderTest.java

@@ -32,16 +32,14 @@ void shouldWhereInsertWhitespace() throws Exception {
     String xml = """
         <script>
         select * from user
-        <where>
-        <if test="1==1">and id = 1</if>
-        <if test="1==1">and id > 0</if>
-        </where>
+        <where><if test="1==1">and id = 1</if><if test="1==1">and id > 0</if></where>
+        <if test="1==1">and id = 1</if><if test="1==1">and id > 0</if>
         </script>
         """;
     SqlSource sqlSource = new XMLScriptBuilder(new Configuration(), new XPathParser(xml).evalNode("/script"))
         .parseScriptNode();
-    assertThat(sqlSource.getBoundSql(1).getSql())
-        .containsPattern("(?m)^\\s*select \\* from user\\s+WHERE\\s+id = 1\\s+and id > 0\\s*$");
+    assertThat(sqlSource.getBoundSql(1).getSql()).containsPattern(
+        "(?m)^\\s*select \\* from user\\s+WHERE\\s+id = 1\\s+and id > 0\\s+and id = 1\\s+and id > 0\\s*$");
   }
 
   @Test