You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/11/25 16:03:18 UTC

[shardingsphere] branch master updated: Format xml end tag (#22426)

This is an automated email from the ASF dual-hosted git repository.

sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new d24413ce3d1 Format xml end tag (#22426)
d24413ce3d1 is described below

commit d24413ce3d1c4e3076380009ab894d350e93ef2b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Nov 26 00:03:05 2022 +0800

    Format xml end tag (#22426)
    
    * Refactor InternalSQLParserParameterizedIT
    
    * Format xml end tag
---
 .../resources/META-INF/mappers/AddressMapper.xml   |    4 +-
 .../resources/META-INF/mappers/OrderItemMapper.xml |    8 +-
 .../resources/META-INF/mappers/OrderMapper.xml     |    8 +-
 .../META-INF/mappers/ShadowUserMapper.xml          |   10 +-
 .../main/resources/META-INF/mappers/UserMapper.xml |    8 +-
 .../src/main/resources/META-INF/mybatis-config.xml |   10 +-
 .../zookeeper/cloud/application-encrypt.xml        |    8 +-
 .../zookeeper/cloud/application-shadow.xml         |    8 +-
 .../application-sharding-databases-tables.xml      |    8 +-
 .../zookeeper/local/application-encrypt.xml        |   16 +-
 .../local/application-readwrite-splitting.xml      |   30 +-
 .../zookeeper/local/application-shadow.xml         |   26 +-
 .../application-sharding-databases-tables.xml      |   34 +-
 .../src/main/resources/logback.xml                 |   10 +-
 .../src/main/resources/META-INF/mybatis-config.xml |    6 +-
 .../application-sharding-databases-tables.xml      |   20 +-
 .../META-INF/application-sharding-databases.xml    |   20 +-
 .../META-INF/application-sharding-tables.xml       |   12 +-
 .../src/main/resources/logback.xml                 |   10 +-
 .../application-sharding-databases-tables.xml      |   28 +-
 .../META-INF/application-sharding-databases.xml    |   28 +-
 .../META-INF/application-sharding-tables.xml       |   20 +-
 .../src/main/resources/logback.xml                 |   10 +-
 .../src/main/resources/META-INF/mybatis-config.xml |    6 +-
 .../application-sharding-databases-tables.xml      |   26 +-
 .../META-INF/application-sharding-databases.xml    |   22 +-
 .../META-INF/application-sharding-tables.xml       |   14 +-
 .../application-sharding-databases-tables.xml      |   28 +-
 .../META-INF/application-sharding-databases.xml    |   28 +-
 .../META-INF/application-sharding-tables.xml       |   20 +-
 .../src/main/resources/META-INF/mybatis-config.xml |    6 +-
 .../application-sharding-databases-tables.xml      |   26 +-
 .../META-INF/application-sharding-databases.xml    |   22 +-
 .../META-INF/application-sharding-tables.xml       |   14 +-
 .../application-sharding-databases-tables.xml      |   28 +-
 .../META-INF/application-sharding-databases.xml    |   28 +-
 .../META-INF/application-sharding-tables.xml       |   20 +-
 .../src/main/resources/logback.xml                 |    4 +-
 .../src/main/resources/logback.xml                 |    6 +-
 .../application-sharding-databases-tables.xml      |   20 +-
 .../META-INF/application-sharding-databases.xml    |   18 +-
 .../META-INF/application-sharding-tables.xml       |    6 +-
 .../src/main/resources/logback.xml                 |    6 +-
 .../src/main/resources/META-INF/mybatis-config.xml |    6 +-
 .../resources/spring/included/rules-context.xml    |    8 +-
 .../resources/cases/federation-query-sql-cases.xml |   26 +-
 .../InternalMySQLParserParameterizedIT.java        |    2 +-
 .../InternalOpenGaussParserParameterizedIT.java    |    2 +-
 .../InternalOracleParserParameterizedIT.java       |    2 +-
 .../InternalPostgreSQLParserParameterizedIT.java   |    2 +-
 .../sql92/InternalSQL92ParserParameterizedIT.java  |    2 +-
 .../InternalSQLServerParserParameterizedIT.java    |    2 +-
 src/resources/checkstyle.xml                       |    4 +-
 src/resources/checkstyle_ci.xml                    |    2 +-
 .../scaling/src/test/resources/env/logback.xml     |    2 +-
 .../scaling/src/test/resources/logback-test.xml    |    6 +-
 .../cases/ddl/ddl-integration-test-cases.xml       |    2 +-
 .../cluster/opengauss/select_sys_data_for_og.xml   |    2 +-
 .../cluster/postgresql/select_sys_data_for_pg.xml  |    2 +-
 .../empty_rules/cluster/show_compute_nodes.xml     |    2 +-
 .../opengauss/select_sys_data_for_og.xml           |    2 +-
 .../postgresql/select_sys_data_for_pg.xml          |    2 +-
 .../empty_rules/standalone/show_compute_nodes.xml  |    2 +-
 .../cases/ral/ral-integration-test-cases.xml       |   40 +-
 .../cases/rdl/rdl-integration-test-cases.xml       |   34 +-
 .../rql/dataset/db/count_single_table_rule.xml     |    8 +-
 .../dataset/db/show_default_sharding_strategy.xml  |   16 +-
 .../rql/dataset/db/show_sharding_scaling_rules.xml |   14 +-
 .../rql/dataset/db/show_sharding_table_nodes.xml   |   14 +-
 .../cases/rql/dataset/db/show_single_table.xml     |    6 +-
 .../count_database_rules.xml                       |   20 +-
 .../count_single_table_rule.xml                    |    8 +-
 .../show_default_sharding_strategy.xml             |    4 +-
 .../show_sharding_scaling_rules.xml                |   12 +-
 .../show_sharding_table_nodes.xml                  |   14 +-
 .../show_single_table.xml                          |    6 +-
 .../count_database_rules.xml                       |   20 +-
 .../count_single_table_rule.xml                    |    8 +-
 .../show_default_sharding_strategy.xml             |    4 +-
 .../show_sharding_scaling_rules.xml                |   12 +-
 .../show_sharding_table_nodes.xml                  |   16 +-
 .../show_single_table.xml                          |    6 +-
 .../show_single_tables.xml                         |   16 +-
 .../rql/dataset/encrypt/count_database_rules.xml   |   20 +-
 .../dataset/encrypt/count_single_table_rule.xml    |    8 +-
 .../encrypt/show_sharding_scaling_rules.xml        |   12 +-
 .../rql/dataset/encrypt/show_single_table.xml      |    6 +-
 .../rql/dataset/encrypt/show_single_tables.xml     |   10 +-
 .../count_database_rules.xml                       |   20 +-
 .../count_single_table_rule.xml                    |    8 +-
 .../show_single_table.xml                          |    6 +-
 .../show_single_tables.xml                         |   24 +-
 .../readwrite_splitting/count_database_rules.xml   |   20 +-
 .../count_single_table_rule.xml                    |    8 +-
 .../show_default_sharding_strategy.xml             |    4 +-
 .../show_sharding_scaling_rules.xml                |   12 +-
 .../readwrite_splitting/show_single_table.xml      |    6 +-
 .../sharding_and_encrypt/count_database_rules.xml  |   20 +-
 .../count_single_table_rule.xml                    |    8 +-
 .../show_default_sharding_strategy.xml             |    4 +-
 .../show_sharding_scaling_rules.xml                |   12 +-
 .../show_sharding_table_nodes.xml                  |   12 +-
 .../sharding_and_encrypt/show_single_table.xml     |    6 +-
 .../sharding_and_encrypt/show_single_tables.xml    |   14 +-
 .../mysql/count_database_rules.xml                 |   20 +-
 .../mysql/count_single_table_rule.xml              |    8 +-
 .../mysql/show_default_sharding_strategy.xml       |    4 +-
 .../mysql/show_sharding_scaling_rules.xml          |   12 +-
 .../mysql/show_single_table.xml                    |    4 +-
 .../cases/rql/dataset/tbl/count_database_rules.xml |   20 +-
 .../rql/dataset/tbl/count_single_table_rule.xml    |    8 +-
 .../dataset/tbl/show_default_sharding_strategy.xml |    4 +-
 .../dataset/tbl/show_sharding_scaling_rules.xml    |   12 +-
 .../rql/dataset/tbl/show_sharding_table_nodes.xml  |   14 +-
 .../cases/rql/dataset/tbl/show_single_table.xml    |    6 +-
 .../src/test/resources/jbossts-properties.xml      |    4 +-
 .../src/test/resources/logback-test.xml            |    4 +-
 .../internal/cases/sql/loader/SQLCasesLoader.java  |    2 +-
 .../parser/src/main/resources/case/dal/explain.xml |   22 +-
 .../parser/src/main/resources/case/dal/install.xml |    8 +-
 test/parser/src/main/resources/case/dal/show.xml   |   92 +-
 .../src/main/resources/case/dal/uninstall.xml      |    8 +-
 .../src/main/resources/case/dcl/alter-login.xml    |   24 +-
 .../src/main/resources/case/dcl/alter-role.xml     |    2 +-
 .../src/main/resources/case/dcl/create-login.xml   |   24 +-
 test/parser/src/main/resources/case/dcl/grant.xml  |    2 +-
 test/parser/src/main/resources/case/dcl/revoke.xml |    2 +-
 .../src/main/resources/case/ddl/alter-table.xml    |  108 +-
 .../src/main/resources/case/ddl/alter-type.xml     |    6 +-
 .../parser/src/main/resources/case/ddl/cluster.xml |    2 +-
 .../src/main/resources/case/ddl/create-table.xml   |   24 +-
 .../src/main/resources/case/ddl/create-view.xml    |   12 +-
 test/parser/src/main/resources/case/ddl/listen.xml |    4 +-
 test/parser/src/main/resources/case/ddl/notify.xml |    4 +-
 test/parser/src/main/resources/case/dml/call.xml   |   76 +-
 test/parser/src/main/resources/case/dml/delete.xml |   72 +-
 test/parser/src/main/resources/case/dml/do.xml     |   16 +-
 test/parser/src/main/resources/case/dml/insert.xml |   80 +-
 test/parser/src/main/resources/case/dml/merge.xml  |    4 +-
 .../parser/src/main/resources/case/dml/replace.xml |   14 +-
 .../main/resources/case/dml/select-aggregate.xml   |    2 +-
 .../main/resources/case/dml/select-expression.xml  |  634 +++++------
 .../main/resources/case/dml/select-group-by.xml    |   18 +-
 .../src/main/resources/case/dml/select-into.xml    |   58 +-
 .../src/main/resources/case/dml/select-join.xml    |   36 +-
 .../src/main/resources/case/dml/select-lock.xml    |   68 +-
 .../main/resources/case/dml/select-order-by.xml    |    6 +-
 .../dml/select-pagination-group-by-order-by.xml    |  292 +++---
 .../main/resources/case/dml/select-pagination.xml  |   14 +-
 .../resources/case/dml/select-special-function.xml |   14 +-
 .../main/resources/case/dml/select-sub-query.xml   |   50 +-
 .../src/main/resources/case/dml/select-with.xml    |    4 +-
 test/parser/src/main/resources/case/dml/select.xml |  280 ++---
 test/parser/src/main/resources/case/dml/table.xml  |    2 +-
 test/parser/src/main/resources/case/dml/update.xml |  100 +-
 test/parser/src/main/resources/case/ral/hint.xml   |    8 +-
 .../src/main/resources/case/ral/migration.xml      |    2 +-
 .../src/main/resources/case/ral/updatable.xml      |    4 +-
 test/parser/src/main/resources/case/rdl/alter.xml  |    6 +-
 test/parser/src/main/resources/case/rdl/create.xml |   62 +-
 test/parser/src/main/resources/case/rdl/drop.xml   |    4 +-
 test/parser/src/main/resources/case/rul/sql.xml    |    2 +-
 test/parser/src/main/resources/case/tcl/lock.xml   |   34 +-
 .../supported/ddl/alter-materialized-view-log.xml  |    4 +-
 .../sql/supported/ddl/alter-pluggable-database.xml |   20 +-
 .../resources/sql/supported/ddl/alter-table.xml    |    2 +-
 .../main/resources/sql/supported/ddl/unlisten.xml  |    6 +-
 .../sql/supported/dml/select-special-function.xml  |    4 +-
 .../main/resources/sql/supported/dml/select.xml    |    2 +-
 .../main/resources/sql/unsupported/unsupported.xml | 1104 ++++++++++----------
 .../InternalDistSQLParserParameterizedIT.java      |    2 +-
 .../query-with-cipher/ddl/alter/alter-table.xml    |   24 +-
 .../query-with-cipher/dml/insert/insert-column.xml |   20 +-
 .../query-with-cipher/dml/insert/insert-set.xml    |    8 +-
 .../query-with-cipher/dml/select/select-join.xml   |    8 +-
 .../query-with-plain/ddl/alter/alter-table.xml     |   24 +-
 .../query-with-plain/dml/insert/insert-column.xml  |   20 +-
 .../query-with-plain/dml/insert/insert-set.xml     |    8 +-
 .../query-with-plain/dml/select/select-join.xml    |    8 +-
 .../case/query-with-plain/dml/update/update.xml    |    2 +-
 .../scenario/sharding/case/dml/select.xml          |   42 +-
 181 files changed, 2512 insertions(+), 2512 deletions(-)

diff --git a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/AddressMapper.xml b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/AddressMapper.xml
index 2ade012b8c3..dbb2dc1c662 100644
--- a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/AddressMapper.xml
+++ b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/AddressMapper.xml
@@ -19,8 +19,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.apache.shardingsphere.example.core.mybatis.repository.MybatisAddressRepository">
     <resultMap id="baseResultMap" type="org.apache.shardingsphere.example.core.api.entity.Address">
-        <result column="address_id" property="addressId" jdbcType="BIGINT"/>
-        <result column="address_name" property="addressName" jdbcType="VARCHAR"/>
+        <result column="address_id" property="addressId" jdbcType="BIGINT" />
+        <result column="address_name" property="addressName" jdbcType="VARCHAR" />
     </resultMap>
 
     <update id="createTableIfNotExists">
diff --git a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderItemMapper.xml b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderItemMapper.xml
index 48aae459c00..c96a233b9ec 100644
--- a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderItemMapper.xml
+++ b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderItemMapper.xml
@@ -19,10 +19,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.apache.shardingsphere.example.core.mybatis.repository.MybatisOrderItemRepository">
     <resultMap id="baseResultMap" type="org.apache.shardingsphere.example.core.api.entity.OrderItem">
-        <result column="order_item_id" property="orderItemId" jdbcType="INTEGER"/>
-        <result column="order_id" property="orderId" jdbcType="INTEGER"/>
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="status" property="status" jdbcType="VARCHAR"/>
+        <result column="order_item_id" property="orderItemId" jdbcType="INTEGER" />
+        <result column="order_id" property="orderId" jdbcType="INTEGER" />
+        <result column="user_id" property="userId" jdbcType="INTEGER" />
+        <result column="status" property="status" jdbcType="VARCHAR" />
     </resultMap>
     
     <update id="createTableIfNotExists">
diff --git a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderMapper.xml b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderMapper.xml
index d32c53c0296..2f8aba8b2c3 100644
--- a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderMapper.xml
+++ b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/OrderMapper.xml
@@ -19,10 +19,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.apache.shardingsphere.example.core.mybatis.repository.MybatisOrderRepository">
     <resultMap id="baseResultMap" type="org.apache.shardingsphere.example.core.api.entity.Order">
-        <result column="order_id" property="orderId" jdbcType="BIGINT"/>
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="address_id" property="addressId" jdbcType="BIGINT"/>
-        <result column="status" property="status" jdbcType="VARCHAR"/>
+        <result column="order_id" property="orderId" jdbcType="BIGINT" />
+        <result column="user_id" property="userId" jdbcType="INTEGER" />
+        <result column="address_id" property="addressId" jdbcType="BIGINT" />
+        <result column="status" property="status" jdbcType="VARCHAR" />
     </resultMap>
 
     <update id="createTableIfNotExists">
diff --git a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/ShadowUserMapper.xml b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/ShadowUserMapper.xml
index 91be367963b..4f2624a5e68 100644
--- a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/ShadowUserMapper.xml
+++ b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/ShadowUserMapper.xml
@@ -19,11 +19,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.apache.shardingsphere.example.core.mybatis.repository.MybatisShadowUserRepository">
     <resultMap id="baseResultMap" type="org.apache.shardingsphere.example.core.api.entity.ShadowUser">
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="user_type" property="userType" jdbcType="INTEGER"/>
-        <result column="username" property="username" jdbcType="VARCHAR"/>
-        <result column="pwd" property="pwd" jdbcType="VARCHAR"/>
-        <result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR"/>
+        <result column="user_id" property="userId" jdbcType="INTEGER" />
+        <result column="user_type" property="userType" jdbcType="INTEGER" />
+        <result column="username" property="username" jdbcType="VARCHAR" />
+        <result column="pwd" property="pwd" jdbcType="VARCHAR" />
+        <result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR" />
     </resultMap>
 
     <update id="createTableIfNotExistsNative">
diff --git a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/UserMapper.xml b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/UserMapper.xml
index c115f3ce55d..eff8a889439 100644
--- a/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/UserMapper.xml
+++ b/examples/example-core/example-spring-mybatis/src/main/resources/META-INF/mappers/UserMapper.xml
@@ -19,10 +19,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.apache.shardingsphere.example.core.mybatis.repository.MybatisUserRepository">
     <resultMap id="baseResultMap" type="org.apache.shardingsphere.example.core.api.entity.User">
-        <result column="user_id" property="userId" jdbcType="INTEGER"/>
-        <result column="username" property="username" jdbcType="VARCHAR"/>
-        <result column="pwd" property="pwd" jdbcType="VARCHAR"/>
-        <result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR"/>
+        <result column="user_id" property="userId" jdbcType="INTEGER" />
+        <result column="username" property="username" jdbcType="VARCHAR" />
+        <result column="pwd" property="pwd" jdbcType="VARCHAR" />
+        <result column="assisted_query_pwd" property="assistedQueryPwd" jdbcType="VARCHAR" />
     </resultMap>
     
     <update id="createTableIfNotExists">
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
index fa18441f644..b1007a7e508 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
@@ -21,10 +21,10 @@
         "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
     <mappers>
-        <mapper resource="META-INF/mappers/AddressMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderItemMapper.xml"/>
-        <mapper resource="META-INF/mappers/UserMapper.xml"/>
-        <mapper resource="META-INF/mappers/ShadowUserMapper.xml"/>
+        <mapper resource="META-INF/mappers/AddressMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderItemMapper.xml" />
+        <mapper resource="META-INF/mappers/UserMapper.xml" />
+        <mapper resource="META-INF/mappers/ShadowUserMapper.xml" />
     </mappers>
 </configuration>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-encrypt.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-encrypt.xml
index 9d439f0a0a1..05cbba12836 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-encrypt.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-encrypt.xml
@@ -41,12 +41,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="encryptDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="encryptDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-shadow.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-shadow.xml
index f31ab7c2f76..2d975ca8dcb 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-shadow.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-shadow.xml
@@ -42,12 +42,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shadowDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shadowDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
index ffd6cfe641e..c8758fd1af9 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/cloud/application-sharding-databases-tables.xml
@@ -42,12 +42,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDatabasesTablesDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDatabasesTablesDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
index 97035cb6f7a..dd684384191 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-encrypt.xml
@@ -35,10 +35,10 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <encrypt:encrypt-algorithm id="name_encryptor" type="AES">
@@ -68,12 +68,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="encryptDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="encryptDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-readwrite-splitting.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-readwrite-splitting.xml
index 872561ea20b..327ca60e9e3 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-readwrite-splitting.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-readwrite-splitting.xml
@@ -31,35 +31,35 @@
                            http://shardingsphere.apache.org/schema/shardingsphere/readwrite-splitting
                            http://shardingsphere.apache.org/schema/shardingsphere/readwrite-splitting/readwrite-splitting.xsd
                            http://shardingsphere.apache.org/schema/shardingsphere/datasource http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd">
-    <import resource="classpath*:META-INF/zookeeper/registry-center.xml"/>
-    <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis"/>
+    <import resource="classpath*:META-INF/zookeeper/registry-center.xml" />
+    <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="demo_write_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_write_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_write_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_read_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_read_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_read_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_read_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_read_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_read_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <readwrite-splitting:load-balance-algorithm id="randomStrategy" type="RANDOM" />
     
     <readwrite-splitting:rule id="readWriteSplittingRule">
         <readwrite-splitting:data-source-rule id="demo_ds" load-balance-algorithm-ref="randomStrategy">
-            <readwrite-splitting:static-strategy id="staticStrategy" write-data-source-name="demo_write_ds" read-data-source-names="demo_read_ds_0, demo_read_ds_1"/>
+            <readwrite-splitting:static-strategy id="staticStrategy" write-data-source-name="demo_write_ds" read-data-source-names="demo_read_ds_0, demo_read_ds_1" />
         </readwrite-splitting:data-source-rule>
     </readwrite-splitting:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
index 31b76b06e70..7028c7ea942 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-shadow.xml
@@ -35,21 +35,21 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="shadow_demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/shadow_demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/shadow_demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <shadow:rule id="shadowRule">
-        <shadow:data-source id="shadow-data-source" source-data-source-name="demo_ds" shadow-data-source-name="shadow_demo_ds"/>
+        <shadow:data-source id="shadow-data-source" source-data-source-name="demo_ds" shadow-data-source-name="shadow_demo_ds" />
         <shadow:shadow-table name="t_user" data-sources="shadow-data-source">
             <shadow:algorithm shadow-algorithm-ref="user-id-insert-match-algorithm" />
             <shadow:algorithm shadow-algorithm-ref="user-id-delete-match-algorithm" />
@@ -102,12 +102,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shadowDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shadowDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
index 317bbd87da3..551c310171a 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/cluster-mode-example/cluster-mode-spring-namespace-mybatis-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
@@ -34,17 +34,17 @@
     <import resource="classpath*:META-INF/zookeeper/registry-center.xml" />
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:sharding-algorithm id="databaseInlineStrategyShardingAlgorithm" type="INLINE">
@@ -65,11 +65,11 @@
         </props>
     </sharding:sharding-algorithm>
     
-    <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm"/>
+    <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm" />
     
-    <sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="orderInlineStrategyShardingAlgorithm"/>
+    <sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="orderInlineStrategyShardingAlgorithm" />
     
-    <sharding:standard-strategy id="orderItemTableStrategy" sharding-column="order_id" algorithm-ref="orderItemInlineStrategyShardingAlgorithm"/>
+    <sharding:standard-strategy id="orderItemTableStrategy" sharding-column="order_id" algorithm-ref="orderItemInlineStrategyShardingAlgorithm" />
     
     <sharding:key-generate-algorithm id="snowflakeAlgorithm" type="SNOWFLAKE">
     </sharding:key-generate-algorithm>
@@ -83,10 +83,10 @@
             <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds_${0..1}.t_order_item_${0..1}" database-strategy-ref="databaseStrategy" table-strategy-ref="orderItemTableStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order, t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order, t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
@@ -103,12 +103,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDatabasesTablesDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDatabasesTablesDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/logback.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/logback.xml
index 161fa9750b2..332ddd56da4 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/logback.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-raw-jdbc-example/src/main/resources/logback.xml
@@ -17,9 +17,9 @@
   -->
 
 <configuration>
-    <property name="log.context.name" value="class-based-sharding-raw-jdbc-example"/>
-    <property name="log.charset" value="UTF-8"/>
-    <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger] %msg %n"/>
+    <property name="log.context.name" value="class-based-sharding-raw-jdbc-example" />
+    <property name="log.charset" value="UTF-8" />
+    <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger] %msg %n" />
     <contextName>${log.context.name}</contextName>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -28,7 +28,7 @@
         </encoder>
     </appender>
     <root>
-        <level value="INFO"/>
-        <appender-ref ref="STDOUT"/>
+        <level value="INFO" />
+        <appender-ref ref="STDOUT" />
     </root>
 </configuration>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-mybatis-example/src/main/resources/META-INF/myb [...]
index 84a6692078f..77c43ce4d78 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
@@ -21,8 +21,8 @@
         "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
     <mappers>
-        <mapper resource="META-INF/mappers/AddressMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderItemMapper.xml"/>
+        <mapper resource="META-INF/mappers/AddressMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderItemMapper.xml" />
     </mappers>
 </configuration>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/ma [...]
index f450b6495dd..bc3a5d237fc 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseStrategyAlgorithm" />
@@ -87,10 +87,10 @@
             <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds_${0..1}.t_order_item_${0..1}" database-strategy-ref="databaseStrategy" table-strategy-ref="orderItemTableStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/reso [...]
index da83189786a..200e5b78140 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseAlgorithm" />
@@ -70,10 +70,10 @@
             <sharding:table-rule logic-table="t_order_item" database-strategy-ref="databaseStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resourc [...]
index a451a827459..3f0758d0878 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml
@@ -36,10 +36,10 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
     
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="orderStrategyAlgorithm" />
@@ -72,10 +72,10 @@
             <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds.t_order_item_${0..1}" table-strategy-ref="orderItemTableStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/logback.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/logback.xml
index 901f062088f..82ed5ffdbbd 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/logback.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-jpa-example/src/main/resources/logback.xml
@@ -17,9 +17,9 @@
   -->
 
 <configuration>
-    <property name="log.context.name" value="class-based-sharding-spring-namespace-jpa-example"/>
-    <property name="log.charset" value="UTF-8"/>
-    <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger] %msg %n"/>
+    <property name="log.context.name" value="class-based-sharding-spring-namespace-jpa-example" />
+    <property name="log.charset" value="UTF-8" />
+    <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger] %msg %n" />
     <contextName>${log.context.name}</contextName>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -28,7 +28,7 @@
         </encoder>
     </appender>
     <root>
-        <level value="INFO"/>
-        <appender-ref ref="STDOUT"/>
+        <level value="INFO" />
+        <appender-ref ref="STDOUT" />
     </root>
 </configuration>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-exampl [...]
index 2eaa6005279..977c195dab6 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseStrategyAlgorithm" />
@@ -87,10 +87,10 @@
             <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds_${0..1}.t_order_item_${0..1}" database-strategy-ref="databaseStrategy" table-strategy-ref="orderItemTableStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
@@ -106,12 +106,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/m [...]
index bec57063d3c..59f416cbf2e 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseAlgorithm" />
@@ -70,10 +70,10 @@
             <sharding:table-rule logic-table="t_order_item" database-strategy-ref="databaseStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
@@ -85,12 +85,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main [...]
index bd149016144..12c17e309d9 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml
@@ -36,10 +36,10 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="orderStrategyAlgorithm" />
@@ -72,10 +72,10 @@
             <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds.t_order_item_${0..1}" table-strategy-ref="orderItemTableStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
@@ -91,12 +91,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/logback.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/logback.xml
index 8586e334500..6d1cf458f27 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/logback.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/class-based-sharding-algorithm-example/class-based-sharding-spring-namespace-mybatis-example/src/main/resources/logback.xml
@@ -17,9 +17,9 @@
   -->
 
 <configuration>
-    <property name="log.context.name" value="class-based-sharding-spring-namespace-mybatis-example"/>
-    <property name="log.charset" value="UTF-8"/>
-    <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger] %msg %n"/>
+    <property name="log.context.name" value="class-based-sharding-spring-namespace-mybatis-example" />
+    <property name="log.charset" value="UTF-8" />
+    <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger] %msg %n" />
     <contextName>${log.context.name}</contextName>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -28,7 +28,7 @@
         </encoder>
     </appender>
     <root>
-        <level value="INFO"/>
-        <appender-ref ref="STDOUT"/>
+        <level value="INFO" />
+        <appender-ref ref="STDOUT" />
     </root>
 </configuration>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
index 84a6692078f..77c43ce4d78 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
@@ -21,8 +21,8 @@
         "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
     <mappers>
-        <mapper resource="META-INF/mappers/AddressMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderItemMapper.xml"/>
+        <mapper resource="META-INF/mappers/AddressMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderItemMapper.xml" />
     </mappers>
 </configuration>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resou [...]
index bd7a5f59a87..fc5942b91fd 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -35,7 +35,7 @@
                            http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding.xsd
                            ">
     <context:annotation-config />
-    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa"/>
+    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
 
     <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="shardingDataSource" />
@@ -55,19 +55,19 @@
     <tx:annotation-driven />
 
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
-        <property name="maximumPoolSize" value="16"/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
+        <property name="maximumPoolSize" value="16" />
     </bean>
 
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
-        <property name="maximumPoolSize" value="16"/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
+        <property name="maximumPoolSize" value="16" />
     </bean>
 
     <sharding:sharding-algorithm id="databaseAlgorithm" type="DATASOURCE_SPI_BASED" />
@@ -96,10 +96,10 @@
             <sharding:table-rule logic-table="t_account" actual-data-nodes="demo_ds_${0..1}.t_account_${0..1}" database-strategy-ref="databaseStrategy" table-strategy-ref="accountTableStrategy" key-generate-strategy-ref="accountKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
 
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/ME [...]
index 53ace22f259..2fe264ee9c4 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -35,7 +35,7 @@
                            http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding.xsd
                            ">
     <context:annotation-config />
-    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa"/>
+    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
 
     <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="shardingDataSource" />
@@ -55,17 +55,17 @@
     <tx:annotation-driven />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
 
     <sharding:sharding-algorithm id="databaseAlgorithm" type="DATASOURCE_SPI_BASED" />
@@ -85,10 +85,10 @@
             <sharding:table-rule logic-table="t_account" database-strategy-ref="databaseStrategy" key-generate-strategy-ref="accountKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META- [...]
index 607d7b937db..a2379897377 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml
@@ -35,7 +35,7 @@
                            http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding.xsd
                            ">
     <context:annotation-config />
-    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa"/>
+    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
     
     <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="shardingDataSource" />
@@ -55,10 +55,10 @@
     <tx:annotation-driven />
     
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:sharding-algorithm id="accountTableAlgorithm" type="T_ACCOUNT_SPI_BASED" />
@@ -84,10 +84,10 @@
             <sharding:table-rule logic-table="t_account" actual-data-nodes="demo_ds.t_account_${0..1}" table-strategy-ref="accountTableStrategy" key-generate-strategy-ref="accountKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/ma [...]
index 57d90b9ed59..b4a6005b7e9 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
 
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
 
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
 
     <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="inlineStrategyShardingAlgorithm" />
@@ -69,10 +69,10 @@
             <sharding:table-rule logic-table="t_order_item" database-strategy-ref="databaseStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
 
@@ -84,12 +84,12 @@
     <tx:annotation-driven />
 
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
 
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/reso [...]
index 57d90b9ed59..b4a6005b7e9 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
 
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
 
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
 
     <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="inlineStrategyShardingAlgorithm" />
@@ -69,10 +69,10 @@
             <sharding:table-rule logic-table="t_order_item" database-strategy-ref="databaseStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
 
@@ -84,12 +84,12 @@
     <tx:annotation-driven />
 
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
 
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resourc [...]
index 6d56c27685a..d5d15a6638f 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/extension-example/custom-sharding-algortihm-example/spi-based-sharding-algorithm-example/spi-based-sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml
@@ -36,10 +36,10 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
 
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
 
     <sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="inlineOrderTableStrategyAlgorithm" />
@@ -68,10 +68,10 @@
             <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds.t_order_item_${0..1}" table-strategy-ref="orderItemTableStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
 
@@ -87,12 +87,12 @@
     <tx:annotation-driven />
 
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
 
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
index 84a6692078f..77c43ce4d78 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
@@ -21,8 +21,8 @@
         "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
     <mappers>
-        <mapper resource="META-INF/mappers/AddressMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderItemMapper.xml"/>
+        <mapper resource="META-INF/mappers/AddressMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderItemMapper.xml" />
     </mappers>
 </configuration>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
index 5bea05bb819..e19774a6a88 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -35,7 +35,7 @@
                            http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding.xsd
                            ">
     <context:annotation-config />
-    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa"/>
+    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
     
     <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="shardingDataSource" />
@@ -55,19 +55,19 @@
     <tx:annotation-driven />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
-        <property name="maximumPoolSize" value="16"/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
+        <property name="maximumPoolSize" value="16" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
-        <property name="maximumPoolSize" value="16"/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
+        <property name="maximumPoolSize" value="16" />
     </bean>
     
     <sharding:sharding-algorithm id="databaseAlgorithm" type="INLINE">
@@ -114,10 +114,10 @@
             <sharding:table-rule logic-table="t_account" actual-data-nodes="demo_ds_${0..1}.t_account_${0..1}" database-strategy-ref="databaseStrategy" table-strategy-ref="accountTableStrategy" key-generate-strategy-ref="accountKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml
index 4ee9d8b91aa..1f59cab681f 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -35,7 +35,7 @@
                            http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding.xsd
                            ">
     <context:annotation-config />
-    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa"/>
+    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
 
     <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="shardingDataSource" />
@@ -55,17 +55,17 @@
     <tx:annotation-driven />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
 
     <sharding:sharding-algorithm id="databaseAlgorithm" type="INLINE">
@@ -89,10 +89,10 @@
             <sharding:table-rule logic-table="t_account" database-strategy-ref="databaseStrategy" key-generate-strategy-ref="accountKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml
index 57a2f105e18..8a9325bca26 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-jpa-example/src/main/resources/META-INF/application-sharding-tables.xml
@@ -35,7 +35,7 @@
                            http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding.xsd
                            ">
     <context:annotation-config />
-    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa"/>
+    <context:component-scan base-package="org.apache.shardingsphere.example.core.jpa" />
     
     <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="shardingDataSource" />
@@ -55,10 +55,10 @@
     <tx:annotation-driven />
     
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:sharding-algorithm id="orderTableAlgorithm" type="INLINE">
@@ -98,10 +98,10 @@
             <sharding:table-rule logic-table="t_account" actual-data-nodes="demo_ds.t_account_${0..1}" table-strategy-ref="accountTableStrategy" key-generate-strategy-ref="accountKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
index 7a14ecb009a..faa4c90ca7f 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="inlineDatabaseStrategyAlgorithm" />
@@ -81,10 +81,10 @@
             <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds_${0..1}.t_order_item_${0..1}" database-strategy-ref="databaseStrategy" table-strategy-ref="orderItemTableStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
@@ -100,12 +100,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
index 40d21030ab9..3abdeec9181 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="inlineStrategyShardingAlgorithm" />
@@ -69,10 +69,10 @@
             <sharding:table-rule logic-table="t_order_item" database-strategy-ref="databaseStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
@@ -84,12 +84,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml
index 3e510fb7eed..b8bb9c0e506 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/sharding-example/sharding-spring-namespace-mybatis-example/src/main/resources/META-INF/application-sharding-tables.xml
@@ -36,10 +36,10 @@
     <context:component-scan base-package="org.apache.shardingsphere.example.core.mybatis" />
     
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="inlineOrderTableStrategyAlgorithm" />
@@ -68,10 +68,10 @@
             <sharding:table-rule logic-table="t_order_item" actual-data-nodes="demo_ds.t_order_item_${0..1}" table-strategy-ref="orderItemTableStrategy" key-generate-strategy-ref="itemKeyGenerator" />
         </sharding:table-rules>
         <sharding:binding-table-rules>
-            <sharding:binding-table-rule logic-tables="t_order,t_order_item"/>
+            <sharding:binding-table-rule logic-tables="t_order,t_order_item" />
         </sharding:binding-table-rules>
         <sharding:broadcast-table-rules>
-            <sharding:broadcast-table-rule table="t_address"/>
+            <sharding:broadcast-table-rule table="t_address" />
         </sharding:broadcast-table-rules>
     </sharding:rule>
     
@@ -87,12 +87,12 @@
     <tx:annotation-driven />
     
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="shardingDataSource"/>
-        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml"/>
+        <property name="dataSource" ref="shardingDataSource" />
+        <property name="mapperLocations" value="classpath*:META-INF/mappers/*.xml" />
     </bean>
     
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository"/>
-        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <property name="basePackage" value="org.apache.shardingsphere.example.core.mybatis.repository" />
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
     </bean>
 </beans>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/logback.xml b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/logback.xml
index 5f53534c20a..6d43bf7d2e7 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/logback.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/logback.xml
@@ -28,8 +28,8 @@
         </encoder>
     </appender>
     
-    <logger name="bitronix.tm" level="info"/>
-    <logger name="com.zaxxer.hikari" level="off"/>
+    <logger name="bitronix.tm" level="info" />
+    <logger name="com.zaxxer.hikari" level="off" />
     
     <root>
         <level value="INFO" />
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/resources/logback.xml b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/resources/logback.xml
index ec10674114d..5c924d18fac 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/resources/logback.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/resources/logback.xml
@@ -28,9 +28,9 @@
         </encoder>
     </appender>
     
-    <logger name="com.atomikos" level="debug"/>
-    <logger name="org.springframework" level="off"/>
-    <logger name="com.zaxxer.hikari" level="off"/>
+    <logger name="com.atomikos" level="debug" />
+    <logger name="org.springframework" level="off" />
+    <logger name="com.zaxxer.hikari" level="off" />
     
     <root>
         <level value="INFO" />
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
index c431b8cd101..4ac35bd97c6 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -39,17 +39,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example" />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean:properties id="databaseInlineProps">
@@ -62,7 +62,7 @@
         </props>
     </sharding:sharding-algorithm>
     
-    <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm"/>
+    <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm" />
     
     <sharding:sharding-algorithm id="orderInlineStrategyShardingAlgorithm" type="INLINE">
         <props>
@@ -70,7 +70,7 @@
         </props>
     </sharding:sharding-algorithm>
     
-    <sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="orderInlineStrategyShardingAlgorithm"/>
+    <sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="orderInlineStrategyShardingAlgorithm" />
     
     <sharding:key-generate-algorithm id="snowflakeAlgorithm" type="SNOWFLAKE">
     </sharding:key-generate-algorithm>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases.xml
index b8d41ac0776..598ce34b08a 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -36,17 +36,17 @@
     <context:component-scan base-package="org.apache.shardingsphere.example" />
     
     <bean id="demo_ds_0" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_0?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <bean id="demo_ds_1" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8"/>
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
+        <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds_1?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:sharding-algorithm id="databaseInlineStrategyShardingAlgorithm" type="INLINE">
@@ -55,7 +55,7 @@
         </props>
     </sharding:sharding-algorithm>
     
-    <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm"/>
+    <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm" />
     
     <sharding:key-generate-algorithm id="snowflakeAlgorithm" type="SNOWFLAKE">
     </sharding:key-generate-algorithm>
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-tables.xml b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-tables.xml
index 2f01af5f3ab..4c2e4ee131c 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-tables.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-tables.xml
@@ -36,10 +36,10 @@
     <context:component-scan base-package="org.apache.shardingsphere.example" />
     
     <bean id="demo_ds" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+        <property name="driverClassName" value="com.mysql.jdbc.Driver" />
         <property name="jdbcUrl" value="jdbc:mysql://localhost:3306/demo_ds?serverTimezone=UTC&amp;useSSL=false&amp;useUnicode=true&amp;characterEncoding=UTF-8" />
-        <property name="username" value="root"/>
-        <property name="password" value=""/>
+        <property name="username" value="root" />
+        <property name="password" value="" />
     </bean>
     
     <sharding:sharding-algorithm id="orderInlineStrategyShardingAlgorithm" type="INLINE">
diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/logback.xml b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/logback.xml
index ff764043ec9..465cc653768 100644
--- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/logback.xml
+++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/logback.xml
@@ -28,9 +28,9 @@
         </encoder>
     </appender>
     
-    <logger name="com.atomikos" level="debug"/>
-    <logger name="org.springframework" level="off"/>
-    <logger name="com.zaxxer.hikari" level="off"/>
+    <logger name="com.atomikos" level="debug" />
+    <logger name="org.springframework" level="off" />
+    <logger name="com.zaxxer.hikari" level="off" />
     
     <root>
         <level value="INFO" />
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
index 84a6692078f..77c43ce4d78 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/META-INF/mybatis-config.xml
@@ -21,8 +21,8 @@
         "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
     <mappers>
-        <mapper resource="META-INF/mappers/AddressMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderMapper.xml"/>
-        <mapper resource="META-INF/mappers/OrderItemMapper.xml"/>
+        <mapper resource="META-INF/mappers/AddressMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderMapper.xml" />
+        <mapper resource="META-INF/mappers/OrderItemMapper.xml" />
     </mappers>
 </configuration>
diff --git a/jdbc/spring/core/spring-namespace/src/test/resources/spring/included/rules-context.xml b/jdbc/spring/core/spring-namespace/src/test/resources/spring/included/rules-context.xml
index 7db40aeee30..d11622d24b1 100644
--- a/jdbc/spring/core/spring-namespace/src/test/resources/spring/included/rules-context.xml
+++ b/jdbc/spring/core/spring-namespace/src/test/resources/spring/included/rules-context.xml
@@ -67,15 +67,15 @@
     
     <readwrite-splitting:rule id="readWriteSplittingRule">
         <readwrite-splitting:data-source-rule id="ds_0">
-            <readwrite-splitting:static-strategy id="staticReadwriteSplittingStrategyWithDs0" write-data-source-name="ds_0_write" read-data-source-names="ds_0_read_0, ds_0_read_1"/>
+            <readwrite-splitting:static-strategy id="staticReadwriteSplittingStrategyWithDs0" write-data-source-name="ds_0_write" read-data-source-names="ds_0_read_0, ds_0_read_1" />
         </readwrite-splitting:data-source-rule>
         <readwrite-splitting:data-source-rule id="ds_1">
-            <readwrite-splitting:static-strategy id="staticReadwriteSplittingStrategyWithDs1" write-data-source-name="ds_1_write" read-data-source-names="ds_1_read_0, ds_1_read_1"/>
+            <readwrite-splitting:static-strategy id="staticReadwriteSplittingStrategyWithDs1" write-data-source-name="ds_1_write" read-data-source-names="ds_1_read_0, ds_1_read_1" />
         </readwrite-splitting:data-source-rule>
     </readwrite-splitting:rule>
     
     <sql-parser:rule id="sqlParseRule" sql-comment-parse-enable="true" parse-tree-cache-ref="parseTreeCache" sql-statement-cache-ref="sqlStatementCache" />
     
-    <sql-parser:cache-option id="sqlStatementCache" initial-capacity="1024" maximum-size="1024"/>
-    <sql-parser:cache-option id="parseTreeCache" initial-capacity="1024" maximum-size="1024"/>
+    <sql-parser:cache-option id="sqlStatementCache" initial-capacity="1024" maximum-size="1024" />
+    <sql-parser:cache-option id="parseTreeCache" initial-capacity="1024" maximum-size="1024" />
 </beans>
diff --git a/kernel/sql-federation/optimizer/src/test/resources/cases/federation-query-sql-cases.xml b/kernel/sql-federation/optimizer/src/test/resources/cases/federation-query-sql-cases.xml
index 57fdea65399..43c059bbe30 100644
--- a/kernel/sql-federation/optimizer/src/test/resources/cases/federation-query-sql-cases.xml
+++ b/kernel/sql-federation/optimizer/src/test/resources/cases/federation-query-sql-cases.xml
@@ -18,42 +18,42 @@
 
 <test-cases>
     <test-case sql="SELECT t_order_federate.order_id, t_order_federate.user_id, t_user_info.user_id FROM t_order_federate JOIN t_user_info ON t_order_federate.user_id = t_user_info.user_id WHERE t_user_info.user_id = 13">
-        <assertion expected-result="EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], user_id0=[$t3])  EnumerableHashJoin(condition=[=($2, $4)], joinType=[inner])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t1):VARCHAR], proj#0..2=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableCalc(expr#0=[{inputs}], expr#1=[CAST($t0):VARCHAR], proj#0..1=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_user_in [...]
+        <assertion expected-result="EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], user_id0=[$t3])  EnumerableHashJoin(condition=[=($2, $4)], joinType=[inner])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t1):VARCHAR], proj#0..2=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableCalc(expr#0=[{inputs}], expr#1=[CAST($t0):VARCHAR], proj#0..1=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_user_in [...]
     </test-case>
     <test-case sql="SELECT user_id, information FROM t_user_info WHERE user_id = 12">
-        <assertion expected-result="TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0, 1]], filters=[[=(CAST($0):INTEGER, 12), null]])"/>
+        <assertion expected-result="TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0, 1]], filters=[[=(CAST($0):INTEGER, 12), null]])" />
     </test-case>
     <test-case sql="SELECT user_id FROM t_user_info WHERE user_id = 12">
-        <assertion expected-result="TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0]], filters=[[=(CAST($0):INTEGER, 12)]])"/>
+        <assertion expected-result="TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0]], filters=[[=(CAST($0):INTEGER, 12)]])" />
     </test-case>
     <test-case sql="SELECT t_order_federate.order_id, t_order_federate.user_id, t_user_info.user_id FROM t_order_federate , t_user_info WHERE t_order_federate.user_id = t_user_info.user_id">
-        <assertion expected-result="EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], user_id0=[$t3])  EnumerableHashJoin(condition=[=($2, $4)], joinType=[inner])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t1):VARCHAR], proj#0..2=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableCalc(expr#0=[{inputs}], expr#1=[CAST($t0):VARCHAR], proj#0..1=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_user_in [...]
+        <assertion expected-result="EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], user_id0=[$t3])  EnumerableHashJoin(condition=[=($2, $4)], joinType=[inner])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t1):VARCHAR], proj#0..2=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableCalc(expr#0=[{inputs}], expr#1=[CAST($t0):VARCHAR], proj#0..1=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_user_in [...]
     </test-case>
     <test-case sql="SELECT t_order_federate.order_id, t_order_federate.user_id, t_user_info.user_id FROM t_order_federate JOIN t_user_info ON t_order_federate.user_id = t_user_info.user_id">
-        <assertion expected-result="EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], user_id0=[$t3])  EnumerableHashJoin(condition=[=($2, $4)], joinType=[inner])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t1):VARCHAR], proj#0..2=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableCalc(expr#0=[{inputs}], expr#1=[CAST($t0):VARCHAR], proj#0..1=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_user_in [...]
+        <assertion expected-result="EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], user_id0=[$t3])  EnumerableHashJoin(condition=[=($2, $4)], joinType=[inner])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t1):VARCHAR], proj#0..2=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableCalc(expr#0=[{inputs}], expr#1=[CAST($t0):VARCHAR], proj#0..1=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_user_in [...]
     </test-case>
     <test-case sql="SELECT t_order_federate.order_id, t_order_federate.user_id, t_user_info.user_id FROM t_order_federate ,t_user_info WHERE t_order_federate.user_id = t_user_info.user_id AND t_user_info.user_id = 13">
-        <assertion expected-result="EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], user_id0=[$t3])  EnumerableHashJoin(condition=[=($2, $4)], joinType=[inner])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t1):VARCHAR], proj#0..2=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableCalc(expr#0=[{inputs}], expr#1=[CAST($t0):VARCHAR], proj#0..1=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_user_in [...]
+        <assertion expected-result="EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], user_id0=[$t3])  EnumerableHashJoin(condition=[=($2, $4)], joinType=[inner])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t1):VARCHAR], proj#0..2=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableCalc(expr#0=[{inputs}], expr#1=[CAST($t0):VARCHAR], proj#0..1=[{exprs}])      TranslatableTableScan(table=[[federate_jdbc, t_user_in [...]
     </test-case>
     <test-case sql="SELECT user.user_id, user.information FROM (SELECT * FROM t_user_info WHERE user_id > 1) as user ">
-        <assertion expected-result="TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0, 1]], filters=[[>(CAST($0):INTEGER, 1), null]])"/>
+        <assertion expected-result="TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0, 1]], filters=[[>(CAST($0):INTEGER, 1), null]])" />
     </test-case>
     <test-case sql="SELECT t_order_federate.order_id, t_order_federate.user_id FROM t_order_federate WHERE EXISTS (SELECT * FROM t_user_info WHERE t_order_federate.user_id = t_user_info.user_id)">
-        <assertion expected-result="EnumerableCalc(expr#0..3=[{inputs}], expr#4=[IS NOT NULL($t3)], proj#0..1=[{exprs}], $condition=[$t4])  EnumerableCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{1}])    TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1, 2]])    EnumerableAggregate(group=[{}], agg#0=[MIN($0)])      EnumerableCalc(expr#0..1=[{inputs}], expr#2=[true], $f0=[$t2])        TranslatableTableScan(table=[[federate_jdbc, t_user_info [...]
+        <assertion expected-result="EnumerableCalc(expr#0..3=[{inputs}], expr#4=[IS NOT NULL($t3)], proj#0..1=[{exprs}], $condition=[$t4])  EnumerableCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{1}])    TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1, 2]])    EnumerableAggregate(group=[{}], agg#0=[MIN($0)])      EnumerableCalc(expr#0..1=[{inputs}], expr#2=[true], $f0=[$t2])        TranslatableTableScan(table=[[federate_jdbc, t_user_info [...]
     </test-case>
     <test-case sql="SELECT t_order_federate.order_id, t_order_federate.user_id FROM t_order_federate WHERE t_order_federate.user_id IN (SELECT t_user_info.user_id FROM t_user_info)">
-        <assertion expected-result="EnumerableCalc(expr#0..2=[{inputs}], proj#0..1=[{exprs}])  EnumerableHashJoin(condition=[=($1, $2)], joinType=[inner])    TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableAggregate(group=[{0}])      TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0]])"/>
+        <assertion expected-result="EnumerableCalc(expr#0..2=[{inputs}], proj#0..1=[{exprs}])  EnumerableHashJoin(condition=[=($1, $2)], joinType=[inner])    TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])    EnumerableAggregate(group=[{0}])      TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0]])" />
     </test-case>
     <test-case sql="SELECT t_order_federate.order_id, t_order_federate.user_id FROM t_order_federate WHERE user_id BETWEEN (SELECT user_id FROM t_user_info WHERE user_id = 1) AND (SELECT user_id FROM t_user_info WHERE user_id = 3)">
-        <assertion expected-result="EnumerableCalc(expr#0..2=[{inputs}], proj#0..1=[{exprs}])  EnumerableNestedLoopJoin(condition=[&lt;=($1, $2)], joinType=[inner])    EnumerableCalc(expr#0..2=[{inputs}], proj#0..1=[{exprs}])      EnumerableNestedLoopJoin(condition=[>=($1, $2)], joinType=[inner])        TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])        EnumerableAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])          TranslatableTableScan(table=[[f [...]
+        <assertion expected-result="EnumerableCalc(expr#0..2=[{inputs}], proj#0..1=[{exprs}])  EnumerableNestedLoopJoin(condition=[&lt;=($1, $2)], joinType=[inner])    EnumerableCalc(expr#0..2=[{inputs}], proj#0..1=[{exprs}])      EnumerableNestedLoopJoin(condition=[>=($1, $2)], joinType=[inner])        TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])        EnumerableAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])          TranslatableTableScan(table=[[f [...]
     </test-case>
     <test-case sql="SELECT order_id, user_id FROM t_order_federate UNION SELECT 1, user_id FROM t_user_info WHERE information = 'before'">
-        <assertion expected-result="EnumerableUnion(all=[false])  TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])  EnumerableCalc(expr#0=[{inputs}], expr#1=['1':VARCHAR], EXPR$0=[$t1], user_id=[$t0])    TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0]], filters=[[=(CAST($1):VARCHAR, 'before'), null]])"/>
+        <assertion expected-result="EnumerableUnion(all=[false])  TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])  EnumerableCalc(expr#0=[{inputs}], expr#1=['1':VARCHAR], EXPR$0=[$t1], user_id=[$t0])    TranslatableTableScan(table=[[federate_jdbc, t_user_info]], fields=[[0]], filters=[[=(CAST($1):VARCHAR, 'before'), null]])" />
     </test-case>
     <test-case sql="SELECT order_id, user_id FROM t_order_federate LIMIT 1">
-        <assertion expected-result="EnumerableLimit(fetch=[1])  TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])"/>
+        <assertion expected-result="EnumerableLimit(fetch=[1])  TranslatableTableScan(table=[[federate_jdbc, t_order_federate]], fields=[[0, 1]])" />
     </test-case>
     <test-case sql="SELECT MAX(order_id), MIN(order_id), SUM(order_id), AVG(order_id), COUNT(1) FROM t_order_federate GROUP BY user_id">
-        <assertion expected-result="EnumerableCalc(expr#0..5=[{inputs}], expr#6=[0], expr#7=[=($t4, $t6)], expr#8=[null:DECIMAL(19, 9)], expr#9=[CASE($t7, $t8, $t3)], expr#10=[/($t9, $t4)], EXPR$0=[$t1], EXPR$1=[$t2], EXPR$2=[$t9], EXPR$3=[$t10], EXPR$4=[$t5])  EnumerableAggregate(group=[{0}], EXPR$0=[MAX($1)], EXPR$1=[MIN($1)], EXPR$2=[$SUM0($2)], agg#3=[COUNT($2)], EXPR$4=[COUNT()])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t0):DECIMAL(19, 9)], user_id=[$t1], order_id=[$t0] [...]
+        <assertion expected-result="EnumerableCalc(expr#0..5=[{inputs}], expr#6=[0], expr#7=[=($t4, $t6)], expr#8=[null:DECIMAL(19, 9)], expr#9=[CASE($t7, $t8, $t3)], expr#10=[/($t9, $t4)], EXPR$0=[$t1], EXPR$1=[$t2], EXPR$2=[$t9], EXPR$3=[$t10], EXPR$4=[$t5])  EnumerableAggregate(group=[{0}], EXPR$0=[MAX($1)], EXPR$1=[MIN($1)], EXPR$2=[$SUM0($2)], agg#3=[COUNT($2)], EXPR$4=[COUNT()])    EnumerableCalc(expr#0..1=[{inputs}], expr#2=[CAST($t0):DECIMAL(19, 9)], user_id=[$t1], order_id=[$t0] [...]
     </test-case>
 </test-cases>
diff --git a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
index d294fcaa6f6..7f68169426c 100644
--- a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
+++ b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
@@ -34,6 +34,6 @@ public final class InternalMySQLParserParameterizedIT extends InternalSQLParserP
     
     @Parameters(name = "{0} ({2}) -> {1}")
     public static Collection<Object[]> getTestParameters() {
-        return InternalSQLParserParameterizedIT.getTestParameters("MySQL", "H2");
+        return getTestParameters("MySQL", "H2");
     }
 }
diff --git a/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java b/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
index 5b025cc5949..9014e0a048f 100644
--- a/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
+++ b/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
@@ -34,6 +34,6 @@ public final class InternalOpenGaussParserParameterizedIT extends InternalSQLPar
     
     @Parameters(name = "{0} ({2}) -> {1}")
     public static Collection<Object[]> getTestParameters() {
-        return InternalSQLParserParameterizedIT.getTestParameters("openGauss");
+        return getTestParameters("openGauss");
     }
 }
diff --git a/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java b/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
index 0b15d345682..4d855f983b3 100644
--- a/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
+++ b/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
@@ -34,6 +34,6 @@ public final class InternalOracleParserParameterizedIT extends InternalSQLParser
     
     @Parameters(name = "{0} ({2}) -> {1}")
     public static Collection<Object[]> getTestParameters() {
-        return InternalSQLParserParameterizedIT.getTestParameters("Oracle");
+        return getTestParameters("Oracle");
     }
 }
diff --git a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
index b3dbe815966..4762128d40c 100644
--- a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
+++ b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
@@ -34,6 +34,6 @@ public final class InternalPostgreSQLParserParameterizedIT extends InternalSQLPa
     
     @Parameters(name = "{0} ({2}) -> {1}")
     public static Collection<Object[]> getTestParameters() {
-        return InternalSQLParserParameterizedIT.getTestParameters("PostgreSQL");
+        return getTestParameters("PostgreSQL");
     }
 }
diff --git a/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java b/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
index 111f559c7c5..df805098b99 100644
--- a/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
+++ b/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
@@ -34,6 +34,6 @@ public final class InternalSQL92ParserParameterizedIT extends InternalSQLParserP
     
     @Parameters(name = "{0} ({2}) -> {1}")
     public static Collection<Object[]> getTestParameters() {
-        return InternalSQLParserParameterizedIT.getTestParameters("SQL92");
+        return getTestParameters("SQL92");
     }
 }
diff --git a/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java b/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
index 9bfcd4ce652..771677c6079 100644
--- a/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
+++ b/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
@@ -34,6 +34,6 @@ public final class InternalSQLServerParserParameterizedIT extends InternalSQLPar
     
     @Parameters(name = "{0} ({2}) -> {1}")
     public static Collection<Object[]> getTestParameters() {
-        return InternalSQLParserParameterizedIT.getTestParameters("SQLServer");
+        return getTestParameters("SQLServer");
     }
 }
diff --git a/src/resources/checkstyle.xml b/src/resources/checkstyle.xml
index d52b498ba91..cead530417f 100644
--- a/src/resources/checkstyle.xml
+++ b/src/resources/checkstyle.xml
@@ -201,7 +201,7 @@
         <module name="DesignForExtension" />
         <module name="FinalClass" />
         <!-- cannot recognize for lombok @NoArgsConstructor(access = AccessLevel.PRIVATE), just ignore -->
-        <!--<module name="HideUtilityClassConstructor"/>-->
+        <!--<module name="HideUtilityClassConstructor" />-->
         <module name="OneTopLevelClass" />
         <module name="InterfaceIsType" />
         <module name="InnerTypeLast" />
@@ -251,7 +251,7 @@
         <module name="SummaryJavadoc" />
         <!--
         <module name="JavadocType">
-            <property name="scope" value="public"/>
+            <property name="scope" value="public" />
         </module>
         -->
         <module name="JavadocMethod">
diff --git a/src/resources/checkstyle_ci.xml b/src/resources/checkstyle_ci.xml
index ad78f06bd57..3921808c46f 100644
--- a/src/resources/checkstyle_ci.xml
+++ b/src/resources/checkstyle_ci.xml
@@ -193,7 +193,7 @@
         <!-- Class Design -->
         <module name="FinalClass" />
         <!-- cannot recognize for lombok @NoArgsConstructor(access = AccessLevel.PRIVATE), just ignore -->
-        <!--<module name="HideUtilityClassConstructor"/>-->
+        <!--<module name="HideUtilityClassConstructor" />-->
         <module name="OneTopLevelClass" />
         <module name="InterfaceIsType" />
         <module name="InnerTypeLast" />
diff --git a/test/integration-test/scaling/src/test/resources/env/logback.xml b/test/integration-test/scaling/src/test/resources/env/logback.xml
index f66809b2f3d..bd0c4654000 100644
--- a/test/integration-test/scaling/src/test/resources/env/logback.xml
+++ b/test/integration-test/scaling/src/test/resources/env/logback.xml
@@ -32,7 +32,7 @@
         <appender-ref ref="console" />
     </logger>
     <logger name="com.zaxxer.hikari.pool.ProxyConnection" level="OFF" />
-    <logger name="org.apache.zookeeper.ZooKeeper" level="WARN"/>
+    <logger name="org.apache.zookeeper.ZooKeeper" level="WARN" />
     <root>
         <level value="ERROR" />
         <appender-ref ref="console" />
diff --git a/test/integration-test/scaling/src/test/resources/logback-test.xml b/test/integration-test/scaling/src/test/resources/logback-test.xml
index 7cd6bb26df3..2e28038ba33 100644
--- a/test/integration-test/scaling/src/test/resources/logback-test.xml
+++ b/test/integration-test/scaling/src/test/resources/logback-test.xml
@@ -25,9 +25,9 @@
     </appender>
     <logger name="org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer" level="WARN" />
     <logger name="com.zaxxer.hikari.pool.ProxyConnection" level="OFF" />
-    <logger name="com.github.dockerjava" level="WARN"/>
-    <logger name="org.apache.zookeeper.ZooKeeper" level="OFF"/>
-    <logger name="org.apache.zookeeper.ClientCnxn" level="OFF"/>
+    <logger name="com.github.dockerjava" level="WARN" />
+    <logger name="org.apache.zookeeper.ZooKeeper" level="OFF" />
+    <logger name="org.apache.zookeeper.ClientCnxn" level="OFF" />
     <root level="INFO">
         <appender-ref ref="console" />
     </root>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml b/test/integration-test/test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
index b9072ef2a79..75636f35402 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
@@ -211,7 +211,7 @@
     
     <test-case sql="ALTER TABLE t_user_details DROP COLUMN number" db-types="MySQL,SQLServer,PostgreSQL,Oracle" scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
         <assertion expected-data-file="alter_drop.xml">
-            <initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details"/>
+            <initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher VARCHAR(45) NULL, description varchar(10))" affected-table="t_user_details" />
         </assertion>
     </test-case>
     
diff --git a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/opengauss/select_sys_data_for_og.xml b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/opengauss/select_sys_data_for_og.xml
index e988773805d..852130358de 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/opengauss/select_sys_data_for_og.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/opengauss/select_sys_data_for_og.xml
@@ -17,7 +17,7 @@
 
 <dataset>
     <metadata>
-        <column name="Schema"/>
+        <column name="Schema" />
         <column name="Name" />
         <column name="Type" />
         <column name="Owner" />
diff --git a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/postgresql/select_sys_data_for_pg.xml b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/postgresql/select_sys_data_for_pg.xml
index 79409136e9d..665af63d088 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/postgresql/select_sys_data_for_pg.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/postgresql/select_sys_data_for_pg.xml
@@ -17,7 +17,7 @@
 
 <dataset>
     <metadata>
-        <column name="Schema"/>
+        <column name="Schema" />
         <column name="Name" />
         <column name="Type" />
         <column name="Owner" />
diff --git a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml
index 33e60507c67..105ed5bdf84 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_compute_nodes.xml
@@ -17,7 +17,7 @@
 
 <dataset>
     <metadata>
-        <column name="instance_id" assertion="false"/>
+        <column name="instance_id" assertion="false" />
         <column name="host" assertion="false" />
         <column name="port" />
         <column name="status" />
diff --git a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/opengauss/select_sys_data_for_og.xml b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/opengauss/select_sys_data_for_og.xml
index 63c76c4fa08..fecbb114fbc 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/opengauss/select_sys_data_for_og.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/opengauss/select_sys_data_for_og.xml
@@ -17,7 +17,7 @@
 
 <dataset>
     <metadata>
-        <column name="Schema"/>
+        <column name="Schema" />
         <column name="Name" />
         <column name="Type" />
         <column name="Owner" />
diff --git a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/postgresql/select_sys_data_for_pg.xml b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/postgresql/select_sys_data_for_pg.xml
index 7335dc5e963..4aaec0363b7 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/postgresql/select_sys_data_for_pg.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/postgresql/select_sys_data_for_pg.xml
@@ -17,7 +17,7 @@
 
 <dataset>
     <metadata>
-        <column name="Schema"/>
+        <column name="Schema" />
         <column name="Name" />
         <column name="Type" />
         <column name="Owner" />
diff --git a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml
index ef47ac4677b..4b666a3efa2 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_compute_nodes.xml
@@ -17,7 +17,7 @@
 
 <dataset>
     <metadata>
-        <column name="instance_id" assertion="false"/>
+        <column name="instance_id" assertion="false" />
         <column name="host" assertion="false" />
         <column name="port" />
         <column name="status" />
diff --git a/test/integration-test/test-suite/src/test/resources/cases/ral/ral-integration-test-cases.xml b/test/integration-test/test-suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
index 4a923e6ca33..cf16a454a29 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/ral/ral-integration-test-cases.xml
@@ -16,66 +16,66 @@
   -->
 <integration-test-cases>
     <test-case sql="SHOW READWRITE_SPLITTING HINT STATUS">
-        <assertion expected-data-file="default_readwrite_splitting_hint.xml"/>
+        <assertion expected-data-file="default_readwrite_splitting_hint.xml" />
         <assertion expected-data-file="set_readwrite_splitting_hint.xml">
-            <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE = write"/>
-            <destroy-sql sql="CLEAR READWRITE_SPLITTING HINT"/>
+            <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE = write" />
+            <destroy-sql sql="CLEAR READWRITE_SPLITTING HINT" />
         </assertion>
         <assertion expected-data-file="default_readwrite_splitting_hint.xml">
-            <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE = write;CLEAR READWRITE_SPLITTING HINT"/>
+            <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE = write;CLEAR READWRITE_SPLITTING HINT" />
         </assertion>
         <assertion expected-data-file="default_readwrite_splitting_hint.xml">
-            <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE = write;CLEAR HINT"/>
+            <initial-sql sql="SET READWRITE_SPLITTING HINT SOURCE = write;CLEAR HINT" />
         </assertion>
     </test-case>
 
     <test-case sql="SHOW SHARDING HINT STATUS">
-        <assertion expected-data-file="default_sharding_hint.xml"/>
+        <assertion expected-data-file="default_sharding_hint.xml" />
         <assertion expected-data-file="set_database_value_hint.xml">
-            <initial-sql sql="SET SHARDING HINT DATABASE_VALUE = 100"/>
-            <destroy-sql sql="CLEAR SHARDING HINT"/>
+            <initial-sql sql="SET SHARDING HINT DATABASE_VALUE = 100" />
+            <destroy-sql sql="CLEAR SHARDING HINT" />
         </assertion>
         <assertion expected-data-file="add_database_value_hint.xml">
-            <initial-sql sql="ADD SHARDING HINT DATABASE_VALUE t_user_item= 100"/>
-            <destroy-sql sql="CLEAR SHARDING HINT"/>
+            <initial-sql sql="ADD SHARDING HINT DATABASE_VALUE t_user_item= 100" />
+            <destroy-sql sql="CLEAR SHARDING HINT" />
         </assertion>
         <assertion expected-data-file="add_table_value_hint.xml">
-            <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item = 100"/>
+            <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item = 100" />
         </assertion>
         <assertion expected-data-file="default_sharding_hint.xml">
-            <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item= 100;CLEAR SHARDING HINT"/>
+            <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item= 100;CLEAR SHARDING HINT" />
         </assertion>
         <assertion expected-data-file="default_sharding_hint.xml">
-            <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item= 100;CLEAR HINT"/>
+            <initial-sql sql="ADD SHARDING HINT TABLE_VALUE t_user_item= 100;CLEAR HINT" />
         </assertion>
     </test-case>
 
     <test-case sql="show dist variable where name = transaction_type">
-        <assertion expected-data-file="default_transaction_type.xml"/>
+        <assertion expected-data-file="default_transaction_type.xml" />
     </test-case>
 
     <test-case sql="show dist variable where name = transaction_type">
         <assertion expected-data-file="transaction_type.xml">
-            <initial-sql sql="set dist variable transaction_type = 'XA'"/>
-            <destroy-sql sql="set dist variable transaction_type = 'LOCAL'"/>
+            <initial-sql sql="set dist variable transaction_type = 'XA'" />
+            <destroy-sql sql="set dist variable transaction_type = 'LOCAL'" />
         </assertion>
     </test-case>
 
     <test-case sql="show dist variable where name = cached_connections">
-        <assertion expected-data-file="cached_connections.xml"/>
+        <assertion expected-data-file="cached_connections.xml" />
     </test-case>
 
     <test-case sql="preview select * from t_user_item">
-        <assertion expected-data-file="preview_sql.xml"/>
+        <assertion expected-data-file="preview_sql.xml" />
     </test-case>
 
     <test-case
             sql="PREVIEW SELECT * FROM t_single_table s INNER JOIN t_user_item i ON s.single_id = i.item_id WHERE i.user_id = 1">
-        <assertion expected-data-file="preview_federation_select.xml"/>
+        <assertion expected-data-file="preview_federation_select.xml" />
     </test-case>
 
     <test-case sql="SHOW COMPUTE NODES">
-        <assertion expected-data-file="show_compute_nodes.xml"/>
+        <assertion expected-data-file="show_compute_nodes.xml" />
     </test-case>
 
     <test-case sql="REFRESH DATABASE METADATA FROM GOVERNANCE CENTER" db-types="MySQL">
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rdl/rdl-integration-test-cases.xml b/test/integration-test/test-suite/src/test/resources/cases/rdl/rdl-integration-test-cases.xml
index 5ad1032779e..a42a08f5aaa 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rdl/rdl-integration-test-cases.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rdl/rdl-integration-test-cases.xml
@@ -34,33 +34,33 @@
     <test-case sql="CREATE SHARDING TABLE REFERENCE RULE (t_order,t_order_item);" db-types="MySQL, PostgreSQL">
         <assertion expected-data-file="create_binding_rules.xml">
             <initial-sql sql="CREATE SHARDING TABLE RULE t_order (DATANODES('ds_2.t_order_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id % 2}')))));
-            CREATE SHARDING TABLE RULE t_order_item (DATANODES('ds_2.t_order_item_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_item_${order_id % 2}')))));"/>
+            CREATE SHARDING TABLE RULE t_order_item (DATANODES('ds_2.t_order_item_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_item_${order_id % 2}')))));" />
             <assertion-sql sql="SHOW SHARDING TABLE REFERENCE RULES;" />
-            <destroy-sql sql="DROP SHARDING TABLE REFERENCE RULE;DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;"/>
+            <destroy-sql sql="DROP SHARDING TABLE REFERENCE RULE;DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;" />
         </assertion>
     </test-case>
     <test-case sql="ALTER SHARDING TABLE REFERENCE RULE (t_order,t_order_item)" db-types="MySQL, PostgreSQL">
         <assertion expected-data-file="alter_binding_rules.xml">
             <initial-sql sql="CREATE SHARDING TABLE RULE t_order (DATANODES('ds_2.t_order_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id % 2}')))));
             CREATE SHARDING TABLE RULE t_order_item (DATANODES('ds_2.t_order_item_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_item_${order_id % 2}')))));
-            CREATE SHARDING TABLE REFERENCE RULE (t_order,t_order_item);"/>
+            CREATE SHARDING TABLE REFERENCE RULE (t_order,t_order_item);" />
             <assertion-sql sql="SHOW SHARDING TABLE REFERENCE RULES;" />
-            <destroy-sql sql="DROP SHARDING TABLE REFERENCE RULE;DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;"/>
+            <destroy-sql sql="DROP SHARDING TABLE REFERENCE RULE;DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;" />
         </assertion>
     </test-case>
     <test-case sql="DROP SHARDING TABLE REFERENCE RULE;" db-types="MySQL, PostgreSQL">
         <assertion expected-data-file="drop_binding_rules.xml">
             <initial-sql sql="CREATE SHARDING TABLE RULE t_order (DATANODES('ds_2.t_order_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id % 2}')))));
             CREATE SHARDING TABLE RULE t_order_item (DATANODES('ds_2.t_order_item_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_item_${order_id % 2}')))));
-            CREATE SHARDING TABLE REFERENCE RULE (t_order,t_order_item);"/>
+            CREATE SHARDING TABLE REFERENCE RULE (t_order,t_order_item);" />
             <assertion-sql sql="SHOW SHARDING TABLE REFERENCE RULES;" />
-            <destroy-sql sql="DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;"/>
+            <destroy-sql sql="DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;" />
         </assertion>
     </test-case>
     <test-case sql="CREATE BROADCAST TABLE RULE t_product_category;" db-types="MySQL, PostgreSQL">
         <assertion expected-data-file="create_broadcast_rules.xml">
             <assertion-sql sql="SHOW BROADCAST TABLE RULES;" />
-            <destroy-sql sql="DROP BROADCAST TABLE RULE t_product_category; "/>
+            <destroy-sql sql="DROP BROADCAST TABLE RULE t_product_category; " />
         </assertion>
     </test-case>
     <test-case sql="DROP BROADCAST TABLE RULE t_country;" db-types="MySQL, PostgreSQL">
@@ -72,14 +72,14 @@
     <test-case sql="CREATE ENCRYPT RULE t_user (COLUMNS((NAME=pwd,PLAIN=pwd_plain,CIPHER=pwd_cipher,TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')))),QUERY_WITH_CIPHER_COLUMN=true);" db-types="MySQL, PostgreSQL">
         <assertion expected-data-file="create_encrypt_rule.xml">
             <assertion-sql sql="SHOW ENCRYPT TABLE RULE t_user;" />
-            <destroy-sql sql="DROP ENCRYPT RULE t_user "/>
+            <destroy-sql sql="DROP ENCRYPT RULE t_user " />
         </assertion>
     </test-case>
     <test-case sql="ALTER ENCRYPT RULE t_user (COLUMNS((NAME=pwd,PLAIN=pwd_plain,CIPHER=pwd_cipher,TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abcd')))),QUERY_WITH_CIPHER_COLUMN=true);" db-types="MySQL, PostgreSQL">
         <assertion expected-data-file="alter_encrypt_rule.xml">
             <initial-sql sql="CREATE ENCRYPT RULE t_user (COLUMNS((NAME=pwd,PLAIN=pwd_plain,CIPHER=pwd_cipher,TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')))),QUERY_WITH_CIPHER_COLUMN=true);" />
             <assertion-sql sql="SHOW ENCRYPT TABLE RULE t_user;" />
-            <destroy-sql sql="DROP ENCRYPT RULE t_user "/>
+            <destroy-sql sql="DROP ENCRYPT RULE t_user " />
         </assertion>
     </test-case>
     <test-case sql="DROP ENCRYPT RULE t_user;" db-types="MySQL, PostgreSQL">
@@ -92,9 +92,9 @@
         <assertion expected-data-file="create_single_table_rules.xml">
             <initial-sql sql="CREATE SHARDING TABLE RULE t_order (DATANODES('ds_2.t_order_${0..3}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id % 4}')))));
             CREATE SHARDING TABLE RULE t_order_item (DATANODES('ds_2.t_order_item_${0..3}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_item_${order_id % 4}')))));
-            SET DEFAULT SINGLE TABLE STORAGE UNIT = ds_1;"/>
+            SET DEFAULT SINGLE TABLE STORAGE UNIT = ds_1;" />
             <assertion-sql sql="SHOW SINGLE TABLES;" />
-            <destroy-sql sql="DROP TABLE temp;SET DEFAULT SINGLE TABLE STORAGE UNIT = RANDOM;DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;"/>
+            <destroy-sql sql="DROP TABLE temp;SET DEFAULT SINGLE TABLE STORAGE UNIT = RANDOM;DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;" />
         </assertion>
     </test-case>
     <test-case sql="CREATE TABLE temp_alter (country_id INT PRIMARY KEY, country_name VARCHAR(50), continent_name VARCHAR(50), creation_date DATE NOT NULL);" db-types="MySQL, PostgreSQL">
@@ -103,7 +103,7 @@
             CREATE SHARDING TABLE RULE t_order_item (DATANODES('ds_2.t_order_item_${0..3}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_item_${order_id % 4}')))));
             SET DEFAULT SINGLE TABLE STORAGE UNIT = ds_1;SET DEFAULT SINGLE TABLE STORAGE UNIT = ds_0;" />
             <assertion-sql sql="SHOW SINGLE TABLES;" />
-            <destroy-sql sql="DROP TABLE temp_alter;SET DEFAULT SINGLE TABLE STORAGE UNIT = RANDOM;DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;"/>
+            <destroy-sql sql="DROP TABLE temp_alter;SET DEFAULT SINGLE TABLE STORAGE UNIT = RANDOM;DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;" />
         </assertion>
     </test-case>
     <test-case sql="SET DEFAULT SINGLE TABLE STORAGE UNIT = RANDOM" db-types="MySQL, PostgreSQL">
@@ -112,29 +112,29 @@
             CREATE SHARDING TABLE RULE t_order_item (DATANODES('ds_2.t_order_item_${0..3}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_item_${order_id % 4}')))));
             SET DEFAULT SINGLE TABLE STORAGE UNIT = ds_0;" />
             <assertion-sql sql="SHOW SINGLE TABLES;" />
-            <destroy-sql sql="DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;"/>
+            <destroy-sql sql="DROP SHARDING TABLE RULE t_order;DROP SHARDING TABLE RULE t_order_item;" />
         </assertion>
     </test-case>
     <test-case sql="CREATE SHARDING TABLE RULE t_order (DATANODES('ds_2.t_order_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id % 2}')))));" db-types="MySQL">
         <assertion expected-data-file="create_sharding_rules.xml">
             <assertion-sql sql="SHOW SHARDING TABLE RULES;" />
-            <destroy-sql sql="DROP SHARDING TABLE RULE t_order"/>
+            <destroy-sql sql="DROP SHARDING TABLE RULE t_order" />
         </assertion>
         <assertion expected-data-file="create_sharding_rules_show_tables.xml">
             <assertion-sql sql="SHOW TABLES;" />
-            <destroy-sql sql="DROP SHARDING TABLE RULE t_order"/>
+            <destroy-sql sql="DROP SHARDING TABLE RULE t_order" />
         </assertion>
     </test-case>
     <test-case sql="ALTER SHARDING TABLE RULE t_order (DATANODES('ds_2.t_order_${0..3}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id % 4}')))));" db-types="MySQL">
         <assertion expected-data-file="alter_sharding_rules.xml">
             <initial-sql sql="CREATE SHARDING TABLE RULE t_order (DATANODES('ds_2.t_order_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id % 2}')))));" />
             <assertion-sql sql="SHOW SHARDING TABLE RULES;" />
-            <destroy-sql sql="DROP SHARDING TABLE RULE t_order"/>
+            <destroy-sql sql="DROP SHARDING TABLE RULE t_order" />
         </assertion>
         <assertion expected-data-file="alter_sharding_rules_show_tables.xml">
             <initial-sql sql="CREATE SHARDING TABLE RULE t_order (DATANODES('ds_2.t_order_${0..1}'),TABLE_STRATEGY(TYPE='standard',SHARDING_COLUMN=order_id,SHARDING_ALGORITHM(TYPE(NAME='inline',PROPERTIES('algorithm-expression'='t_order_${order_id % 2}')))));" />
             <assertion-sql sql="SHOW TABLES;" />
-            <destroy-sql sql="DROP SHARDING TABLE RULE t_order"/>
+            <destroy-sql sql="DROP SHARDING TABLE RULE t_order" />
         </assertion>
     </test-case>
     <test-case sql="DROP SHARDING TABLE RULE t_order" db-types="MySQL">
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/count_single_table_rule.xml
index de44ecc6a2f..5e9c22908e4 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| db| 11"/>
+    <row values="single_table| db| 11" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_default_sharding_strategy.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_default_sharding_strategy.xml
index c785920cf1d..6de4eac3474 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_default_sharding_strategy.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_default_sharding_strategy.xml
@@ -17,13 +17,13 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="type"/>
-        <column name="sharding_column"/>
-        <column name="sharding_algorithm_name"/>
-        <column name="sharding_algorithm_type"/>
-        <column name="sharding_algorithm_props"/>
+        <column name="name" />
+        <column name="type" />
+        <column name="sharding_column" />
+        <column name="sharding_algorithm_name" />
+        <column name="sharding_algorithm_type" />
+        <column name="sharding_algorithm_props" />
     </metadata>
-    <row values="TABLE| NONE| | | | "/>
-    <row values="DATABASE| NONE| | | | "/>
+    <row values="TABLE| NONE| | | | " />
+    <row values="DATABASE| NONE| | | | " />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_sharding_scaling_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_sharding_scaling_rules.xml
index 2a96591bfa4..a84282bc66a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_sharding_scaling_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_sharding_scaling_rules.xml
@@ -17,12 +17,12 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="input"/>
-        <column name="output"/>
-        <column name="stream_channel"/>
-        <column name="completion_detector"/>
-        <column name="data_consistency_checker"/>
+        <column name="name" />
+        <column name="input" />
+        <column name="output" />
+        <column name="stream_channel" />
+        <column name="completion_detector" />
+        <column name="data_consistency_checker" />
     </metadata>
-<!--    <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id| IT.STANDARD.FIXTURE| | | | | | | | "/>-->
+<!--    <row values="t_order| ds_${0..9}.t_order| | STANDARD| user_id| IT.STANDARD.FIXTURE| | | | | | | | " />-->
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_sharding_table_nodes.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_sharding_table_nodes.xml
index 9bf87352d84..1380dab5d74 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_sharding_table_nodes.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_sharding_table_nodes.xml
@@ -17,12 +17,12 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="nodes"/>
+        <column name="name" />
+        <column name="nodes" />
     </metadata>
-    <row values="t_order| ds_0.t_order, ds_1.t_order, ds_2.t_order, ds_3.t_order, ds_4.t_order, ds_5.t_order, ds_6.t_order, ds_7.t_order, ds_8.t_order, ds_9.t_order"/>
-    <row values="t_order_item| ds_0.t_order_item, ds_1.t_order_item, ds_2.t_order_item, ds_3.t_order_item, ds_4.t_order_item, ds_5.t_order_item, ds_6.t_order_item, ds_7.t_order_item, ds_8.t_order_item, ds_9.t_order_item"/>
-    <row values="t_order_details| ds_0.t_order_details, ds_1.t_order_details, ds_2.t_order_details, ds_3.t_order_details, ds_4.t_order_details, ds_5.t_order_details, ds_6.t_order_details, ds_7.t_order_details, ds_8.t_order_details, ds_9.t_order_details"/>
-    <row values="t_order_federate_sharding| ds_0.t_order_federate_sharding, ds_1.t_order_federate_sharding"/>
-    <row values="t_order_item_federate_sharding| ds_0.t_order_item_federate_sharding, ds_1.t_order_item_federate_sharding"/>
+    <row values="t_order| ds_0.t_order, ds_1.t_order, ds_2.t_order, ds_3.t_order, ds_4.t_order, ds_5.t_order, ds_6.t_order, ds_7.t_order, ds_8.t_order, ds_9.t_order" />
+    <row values="t_order_item| ds_0.t_order_item, ds_1.t_order_item, ds_2.t_order_item, ds_3.t_order_item, ds_4.t_order_item, ds_5.t_order_item, ds_6.t_order_item, ds_7.t_order_item, ds_8.t_order_item, ds_9.t_order_item" />
+    <row values="t_order_details| ds_0.t_order_details, ds_1.t_order_details, ds_2.t_order_details, ds_3.t_order_details, ds_4.t_order_details, ds_5.t_order_details, ds_6.t_order_details, ds_7.t_order_details, ds_8.t_order_details, ds_9.t_order_details" />
+    <row values="t_order_federate_sharding| ds_0.t_order_federate_sharding, ds_1.t_order_federate_sharding" />
+    <row values="t_order_item_federate_sharding| ds_0.t_order_item_federate_sharding, ds_1.t_order_item_federate_sharding" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_single_table.xml
index ca227ced039..a45ce17b2a9 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/db/show_single_table.xml
@@ -17,8 +17,8 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| ds_0"/>
+    <row values="t_single_table| ds_0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/count_database_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/count_database_rules.xml
index d9e628646dd..e9703f39e7c 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/count_database_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/count_database_rules.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| 3"/>
-    <row values="sharding_table| 5"/>
-    <row values="sharding_binding_table| 1"/>
-    <row values="sharding_broadcast_table| 2"/>
-    <row values="readwrite_splitting| 10"/>
-    <row values="db_discovery| 0"/>
-    <row values="encrypt| 0"/>
-    <row values="shadow| 0"/>
+    <row values="single_table| 3" />
+    <row values="sharding_table| 5" />
+    <row values="sharding_binding_table| 1" />
+    <row values="sharding_broadcast_table| 2" />
+    <row values="readwrite_splitting| 10" />
+    <row values="db_discovery| 0" />
+    <row values="encrypt| 0" />
+    <row values="shadow| 0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/count_single_table_rule.xml
index 971bc46d2d3..2d540154c97 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| dbtbl_with_readwrite_splitting| 7"/>
+    <row values="single_table| dbtbl_with_readwrite_splitting| 7" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_default_sharding_strategy.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_default_sharding_strategy.xml
index b85a6d3cc64..6de4eac3474 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_default_sharding_strategy.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_default_sharding_strategy.xml
@@ -24,6 +24,6 @@
         <column name="sharding_algorithm_type" />
         <column name="sharding_algorithm_props" />
     </metadata>
-    <row values="TABLE| NONE| | | | "/>
-    <row values="DATABASE| NONE| | | | "/>
+    <row values="TABLE| NONE| | | | " />
+    <row values="DATABASE| NONE| | | | " />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_scaling_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_scaling_rules.xml
index ac1e9af960e..f0ad119ee0a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_scaling_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_scaling_rules.xml
@@ -17,11 +17,11 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="input"/>
-        <column name="output"/>
-        <column name="stream_channel"/>
-        <column name="completion_detector"/>
-        <column name="data_consistency_checker"/>
+        <column name="name" />
+        <column name="input" />
+        <column name="output" />
+        <column name="stream_channel" />
+        <column name="completion_detector" />
+        <column name="data_consistency_checker" />
     </metadata>
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_nodes.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_nodes.xml
index 07e2e23f8f9..186843dc370 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_nodes.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_sharding_table_nodes.xml
@@ -17,12 +17,12 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="nodes"/>
+        <column name="name" />
+        <column name="nodes" />
     </metadata>
-    <row values="t_order| readwrite_ds_0.t_order_0, readwrite_ds_0.t_order_1, readwrite_ds_0.t_order_2, readwrite_ds_0.t_order_3, readwrite_ds_0.t_order_4, readwrite_ds_0.t_order_5, readwrite_ds_0.t_order_6, readwrite_ds_0.t_order_7, readwrite_ds_0.t_order_8, readwrite_ds_0.t_order_9, readwrite_ds_1.t_order_0, readwrite_ds_1.t_order_1, readwrite_ds_1.t_order_2, readwrite_ds_1.t_order_3, readwrite_ds_1.t_order_4, readwrite_ds_1.t_order_5, readwrite_ds_1.t_order_6, readwrite_ds_1.t_order_7 [...]
-    <row values="t_order_item| readwrite_ds_0.t_order_item_0, readwrite_ds_0.t_order_item_1, readwrite_ds_0.t_order_item_2, readwrite_ds_0.t_order_item_3, readwrite_ds_0.t_order_item_4, readwrite_ds_0.t_order_item_5, readwrite_ds_0.t_order_item_6, readwrite_ds_0.t_order_item_7, readwrite_ds_0.t_order_item_8, readwrite_ds_0.t_order_item_9, readwrite_ds_1.t_order_item_0, readwrite_ds_1.t_order_item_1, readwrite_ds_1.t_order_item_2, readwrite_ds_1.t_order_item_3, readwrite_ds_1.t_order_item [...]
-    <row values="t_order_details| readwrite_ds_0.t_order_details_0, readwrite_ds_0.t_order_details_1, readwrite_ds_0.t_order_details_2, readwrite_ds_0.t_order_details_3, readwrite_ds_0.t_order_details_4, readwrite_ds_0.t_order_details_5, readwrite_ds_0.t_order_details_6, readwrite_ds_0.t_order_details_7, readwrite_ds_0.t_order_details_8, readwrite_ds_0.t_order_details_9, readwrite_ds_1.t_order_details_0, readwrite_ds_1.t_order_details_1, readwrite_ds_1.t_order_details_2, readwrite_ds_1.t [...]
-    <row values="t_order_item_federate_sharding| readwrite_ds_1.t_order_item_federate_sharding_0, readwrite_ds_1.t_order_item_federate_sharding_1"/>
-    <row values="t_order_federate_sharding| readwrite_ds_1.t_order_federate_sharding_0, readwrite_ds_1.t_order_federate_sharding_1"/>
+    <row values="t_order| readwrite_ds_0.t_order_0, readwrite_ds_0.t_order_1, readwrite_ds_0.t_order_2, readwrite_ds_0.t_order_3, readwrite_ds_0.t_order_4, readwrite_ds_0.t_order_5, readwrite_ds_0.t_order_6, readwrite_ds_0.t_order_7, readwrite_ds_0.t_order_8, readwrite_ds_0.t_order_9, readwrite_ds_1.t_order_0, readwrite_ds_1.t_order_1, readwrite_ds_1.t_order_2, readwrite_ds_1.t_order_3, readwrite_ds_1.t_order_4, readwrite_ds_1.t_order_5, readwrite_ds_1.t_order_6, readwrite_ds_1.t_order_7 [...]
+    <row values="t_order_item| readwrite_ds_0.t_order_item_0, readwrite_ds_0.t_order_item_1, readwrite_ds_0.t_order_item_2, readwrite_ds_0.t_order_item_3, readwrite_ds_0.t_order_item_4, readwrite_ds_0.t_order_item_5, readwrite_ds_0.t_order_item_6, readwrite_ds_0.t_order_item_7, readwrite_ds_0.t_order_item_8, readwrite_ds_0.t_order_item_9, readwrite_ds_1.t_order_item_0, readwrite_ds_1.t_order_item_1, readwrite_ds_1.t_order_item_2, readwrite_ds_1.t_order_item_3, readwrite_ds_1.t_order_item [...]
+    <row values="t_order_details| readwrite_ds_0.t_order_details_0, readwrite_ds_0.t_order_details_1, readwrite_ds_0.t_order_details_2, readwrite_ds_0.t_order_details_3, readwrite_ds_0.t_order_details_4, readwrite_ds_0.t_order_details_5, readwrite_ds_0.t_order_details_6, readwrite_ds_0.t_order_details_7, readwrite_ds_0.t_order_details_8, readwrite_ds_0.t_order_details_9, readwrite_ds_1.t_order_details_0, readwrite_ds_1.t_order_details_1, readwrite_ds_1.t_order_details_2, readwrite_ds_1.t [...]
+    <row values="t_order_item_federate_sharding| readwrite_ds_1.t_order_item_federate_sharding_0, readwrite_ds_1.t_order_item_federate_sharding_1" />
+    <row values="t_order_federate_sharding| readwrite_ds_1.t_order_federate_sharding_0, readwrite_ds_1.t_order_federate_sharding_1" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_single_table.xml
index 421d9037b10..d0aace5a279 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting/show_single_table.xml
@@ -17,8 +17,8 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| readwrite_ds_0"/>
+    <row values="t_single_table| readwrite_ds_0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/count_database_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/count_database_rules.xml
index b2bf6edada5..56b50316a69 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/count_database_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/count_database_rules.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| 5"/>
-    <row values="sharding_table| 6"/>
-    <row values="sharding_binding_table| 1"/>
-    <row values="sharding_broadcast_table| 0"/>
-    <row values="readwrite_splitting| 10"/>
-    <row values="db_discovery| 0"/>
-    <row values="encrypt| 4"/>
-    <row values="shadow| 0"/>
+    <row values="single_table| 5" />
+    <row values="sharding_table| 6" />
+    <row values="sharding_binding_table| 1" />
+    <row values="sharding_broadcast_table| 0" />
+    <row values="readwrite_splitting| 10" />
+    <row values="db_discovery| 0" />
+    <row values="encrypt| 4" />
+    <row values="shadow| 0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/count_single_table_rule.xml
index f879f5dba73..dc84c2e4e2e 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| dbtbl_with_readwrite_splitting_and_encrypt| 8"/>
+    <row values="single_table| dbtbl_with_readwrite_splitting_and_encrypt| 8" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_default_sharding_strategy.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_default_sharding_strategy.xml
index b85a6d3cc64..6de4eac3474 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_default_sharding_strategy.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_default_sharding_strategy.xml
@@ -24,6 +24,6 @@
         <column name="sharding_algorithm_type" />
         <column name="sharding_algorithm_props" />
     </metadata>
-    <row values="TABLE| NONE| | | | "/>
-    <row values="DATABASE| NONE| | | | "/>
+    <row values="TABLE| NONE| | | | " />
+    <row values="DATABASE| NONE| | | | " />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_scaling_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_scaling_rules.xml
index ac1e9af960e..f0ad119ee0a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_scaling_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_scaling_rules.xml
@@ -17,11 +17,11 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="input"/>
-        <column name="output"/>
-        <column name="stream_channel"/>
-        <column name="completion_detector"/>
-        <column name="data_consistency_checker"/>
+        <column name="name" />
+        <column name="input" />
+        <column name="output" />
+        <column name="stream_channel" />
+        <column name="completion_detector" />
+        <column name="data_consistency_checker" />
     </metadata>
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_nodes.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_nodes.xml
index d9e1cc96b77..314b0a02075 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_nodes.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_sharding_table_nodes.xml
@@ -20,12 +20,12 @@
         <column name="name" />
         <column name="nodes" />
     </metadata>
-    <row values="t_order| readwrite_ds_0.t_order_0, readwrite_ds_0.t_order_1, readwrite_ds_0.t_order_2, readwrite_ds_0.t_order_3, readwrite_ds_0.t_order_4, readwrite_ds_0.t_order_5, readwrite_ds_0.t_order_6, readwrite_ds_0.t_order_7, readwrite_ds_0.t_order_8, readwrite_ds_0.t_order_9, readwrite_ds_1.t_order_0, readwrite_ds_1.t_order_1, readwrite_ds_1.t_order_2, readwrite_ds_1.t_order_3, readwrite_ds_1.t_order_4, readwrite_ds_1.t_order_5, readwrite_ds_1.t_order_6, readwrite_ds_1.t_order_7 [...]
-    <row values="t_order_item| readwrite_ds_0.t_order_item_0, readwrite_ds_0.t_order_item_1, readwrite_ds_0.t_order_item_2, readwrite_ds_0.t_order_item_3, readwrite_ds_0.t_order_item_4, readwrite_ds_0.t_order_item_5, readwrite_ds_0.t_order_item_6, readwrite_ds_0.t_order_item_7, readwrite_ds_0.t_order_item_8, readwrite_ds_0.t_order_item_9, readwrite_ds_1.t_order_item_0, readwrite_ds_1.t_order_item_1, readwrite_ds_1.t_order_item_2, readwrite_ds_1.t_order_item_3, readwrite_ds_1.t_order_item [...]
-    <row values="t_user_item| readwrite_ds_0.t_user_item_0, readwrite_ds_0.t_user_item_1, readwrite_ds_0.t_user_item_2, readwrite_ds_0.t_user_item_3, readwrite_ds_0.t_user_item_4, readwrite_ds_0.t_user_item_5, readwrite_ds_0.t_user_item_6, readwrite_ds_0.t_user_item_7, readwrite_ds_0.t_user_item_8, readwrite_ds_0.t_user_item_9, readwrite_ds_1.t_user_item_0, readwrite_ds_1.t_user_item_1, readwrite_ds_1.t_user_item_2, readwrite_ds_1.t_user_item_3, readwrite_ds_1.t_user_item_4, readwrite_ds [...]
-    <row values="t_user| readwrite_ds_0.t_user_0, readwrite_ds_0.t_user_1, readwrite_ds_0.t_user_2, readwrite_ds_0.t_user_3, readwrite_ds_0.t_user_4, readwrite_ds_0.t_user_5, readwrite_ds_0.t_user_6, readwrite_ds_0.t_user_7, readwrite_ds_0.t_user_8, readwrite_ds_0.t_user_9, readwrite_ds_1.t_user_0, readwrite_ds_1.t_user_1, readwrite_ds_1.t_user_2, readwrite_ds_1.t_user_3, readwrite_ds_1.t_user_4, readwrite_ds_1.t_user_5, readwrite_ds_1.t_user_6, readwrite_ds_1.t_user_7, readwrite_ds_1.t_ [...]
-    <row values="t_user_details| readwrite_ds_0.t_user_details_0, readwrite_ds_0.t_user_details_1, readwrite_ds_0.t_user_details_2, readwrite_ds_0.t_user_details_3, readwrite_ds_0.t_user_details_4, readwrite_ds_0.t_user_details_5, readwrite_ds_0.t_user_details_6, readwrite_ds_0.t_user_details_7, readwrite_ds_0.t_user_details_8, readwrite_ds_0.t_user_details_9, readwrite_ds_1.t_user_details_0, readwrite_ds_1.t_user_details_1, readwrite_ds_1.t_user_details_2, readwrite_ds_1.t_user_details_ [...]
-    <row values="t_order_item_federate_sharding| readwrite_ds_1.t_order_item_federate_sharding_0, readwrite_ds_1.t_order_item_federate_sharding_1"/>
-    <row values="t_order_federate_sharding| readwrite_ds_1.t_order_federate_sharding_0, readwrite_ds_1.t_order_federate_sharding_1"/>
-    <row values="t_user_encrypt_federate_sharding| readwrite_ds_1.t_user_encrypt_federate_sharding_0, readwrite_ds_1.t_user_encrypt_federate_sharding_1"/>
+    <row values="t_order| readwrite_ds_0.t_order_0, readwrite_ds_0.t_order_1, readwrite_ds_0.t_order_2, readwrite_ds_0.t_order_3, readwrite_ds_0.t_order_4, readwrite_ds_0.t_order_5, readwrite_ds_0.t_order_6, readwrite_ds_0.t_order_7, readwrite_ds_0.t_order_8, readwrite_ds_0.t_order_9, readwrite_ds_1.t_order_0, readwrite_ds_1.t_order_1, readwrite_ds_1.t_order_2, readwrite_ds_1.t_order_3, readwrite_ds_1.t_order_4, readwrite_ds_1.t_order_5, readwrite_ds_1.t_order_6, readwrite_ds_1.t_order_7 [...]
+    <row values="t_order_item| readwrite_ds_0.t_order_item_0, readwrite_ds_0.t_order_item_1, readwrite_ds_0.t_order_item_2, readwrite_ds_0.t_order_item_3, readwrite_ds_0.t_order_item_4, readwrite_ds_0.t_order_item_5, readwrite_ds_0.t_order_item_6, readwrite_ds_0.t_order_item_7, readwrite_ds_0.t_order_item_8, readwrite_ds_0.t_order_item_9, readwrite_ds_1.t_order_item_0, readwrite_ds_1.t_order_item_1, readwrite_ds_1.t_order_item_2, readwrite_ds_1.t_order_item_3, readwrite_ds_1.t_order_item [...]
+    <row values="t_user_item| readwrite_ds_0.t_user_item_0, readwrite_ds_0.t_user_item_1, readwrite_ds_0.t_user_item_2, readwrite_ds_0.t_user_item_3, readwrite_ds_0.t_user_item_4, readwrite_ds_0.t_user_item_5, readwrite_ds_0.t_user_item_6, readwrite_ds_0.t_user_item_7, readwrite_ds_0.t_user_item_8, readwrite_ds_0.t_user_item_9, readwrite_ds_1.t_user_item_0, readwrite_ds_1.t_user_item_1, readwrite_ds_1.t_user_item_2, readwrite_ds_1.t_user_item_3, readwrite_ds_1.t_user_item_4, readwrite_ds [...]
+    <row values="t_user| readwrite_ds_0.t_user_0, readwrite_ds_0.t_user_1, readwrite_ds_0.t_user_2, readwrite_ds_0.t_user_3, readwrite_ds_0.t_user_4, readwrite_ds_0.t_user_5, readwrite_ds_0.t_user_6, readwrite_ds_0.t_user_7, readwrite_ds_0.t_user_8, readwrite_ds_0.t_user_9, readwrite_ds_1.t_user_0, readwrite_ds_1.t_user_1, readwrite_ds_1.t_user_2, readwrite_ds_1.t_user_3, readwrite_ds_1.t_user_4, readwrite_ds_1.t_user_5, readwrite_ds_1.t_user_6, readwrite_ds_1.t_user_7, readwrite_ds_1.t_ [...]
+    <row values="t_user_details| readwrite_ds_0.t_user_details_0, readwrite_ds_0.t_user_details_1, readwrite_ds_0.t_user_details_2, readwrite_ds_0.t_user_details_3, readwrite_ds_0.t_user_details_4, readwrite_ds_0.t_user_details_5, readwrite_ds_0.t_user_details_6, readwrite_ds_0.t_user_details_7, readwrite_ds_0.t_user_details_8, readwrite_ds_0.t_user_details_9, readwrite_ds_1.t_user_details_0, readwrite_ds_1.t_user_details_1, readwrite_ds_1.t_user_details_2, readwrite_ds_1.t_user_details_ [...]
+    <row values="t_order_item_federate_sharding| readwrite_ds_1.t_order_item_federate_sharding_0, readwrite_ds_1.t_order_item_federate_sharding_1" />
+    <row values="t_order_federate_sharding| readwrite_ds_1.t_order_federate_sharding_0, readwrite_ds_1.t_order_federate_sharding_1" />
+    <row values="t_user_encrypt_federate_sharding| readwrite_ds_1.t_user_encrypt_federate_sharding_0, readwrite_ds_1.t_user_encrypt_federate_sharding_1" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_single_table.xml
index 421d9037b10..d0aace5a279 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_single_table.xml
@@ -17,8 +17,8 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| readwrite_ds_0"/>
+    <row values="t_single_table| readwrite_ds_0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_single_tables.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_single_tables.xml
index 85b26ce7e53..4668e8ee32a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_single_tables.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_single_tables.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_merchant| readwrite_ds_1"/>
-    <row values="t_order_federate| readwrite_ds_0"/>
-    <row values="t_order_item_federate| readwrite_ds_1"/>
+    <row values="t_merchant| readwrite_ds_1" />
+    <row values="t_order_federate| readwrite_ds_0" />
+    <row values="t_order_item_federate| readwrite_ds_1" />
     <row values="t_product| readwrite_ds_0" />
     <row values="t_product_detail| readwrite_ds_1" />
-    <row values="t_single_table| readwrite_ds_0"/>
-    <row values="t_user_encrypt_federate| readwrite_ds_1"/>
-    <row values="t_user_info| readwrite_ds_1"/>
+    <row values="t_single_table| readwrite_ds_0" />
+    <row values="t_user_encrypt_federate| readwrite_ds_1" />
+    <row values="t_user_info| readwrite_ds_1" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_database_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_database_rules.xml
index 0993a38c7e5..3adc7c59f52 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_database_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_database_rules.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| 3"/>
-    <row values="sharding_table| 0"/>
-    <row values="sharding_binding_table| 0"/>
-    <row values="sharding_broadcast_table| 0"/>
-    <row values="readwrite_splitting| 0"/>
-    <row values="db_discovery| 0"/>
-    <row values="encrypt| 2"/>
-    <row values="shadow| 0"/>
+    <row values="single_table| 3" />
+    <row values="sharding_table| 0" />
+    <row values="sharding_binding_table| 0" />
+    <row values="sharding_broadcast_table| 0" />
+    <row values="readwrite_splitting| 0" />
+    <row values="db_discovery| 0" />
+    <row values="encrypt| 2" />
+    <row values="shadow| 0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_single_table_rule.xml
index 6db12414a34..6222da24db8 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| encrypt| 3"/>
+    <row values="single_table| encrypt| 3" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_sharding_scaling_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_sharding_scaling_rules.xml
index ac1e9af960e..f0ad119ee0a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_sharding_scaling_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_sharding_scaling_rules.xml
@@ -17,11 +17,11 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="input"/>
-        <column name="output"/>
-        <column name="stream_channel"/>
-        <column name="completion_detector"/>
-        <column name="data_consistency_checker"/>
+        <column name="name" />
+        <column name="input" />
+        <column name="output" />
+        <column name="stream_channel" />
+        <column name="completion_detector" />
+        <column name="data_consistency_checker" />
     </metadata>
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_table.xml
index a36e3d9be16..5cb5227c9a2 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_table.xml
@@ -17,8 +17,8 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| encrypt"/>
+    <row values="t_single_table| encrypt" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
index 82ce7990109..4210bece628 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
@@ -17,10 +17,10 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| encrypt"/>
-    <row values="t_user| encrypt"/>
-    <row values="t_user_item| encrypt"/>
+    <row values="t_single_table| encrypt" />
+    <row values="t_user| encrypt" />
+    <row values="t_user_item| encrypt" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/count_database_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/count_database_rules.xml
index 4d177c32118..885d169b995 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/count_database_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/count_database_rules.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| 10"/>
-    <row values="sharding_table| 0"/>
-    <row values="sharding_binding_table| 0"/>
-    <row values="sharding_broadcast_table| 0"/>
-    <row values="readwrite_splitting| 1"/>
-    <row values="db_discovery| 0"/>
-    <row values="encrypt| 4"/>
-    <row values="shadow| 0"/>
+    <row values="single_table| 10" />
+    <row values="sharding_table| 0" />
+    <row values="sharding_binding_table| 0" />
+    <row values="sharding_broadcast_table| 0" />
+    <row values="readwrite_splitting| 1" />
+    <row values="db_discovery| 0" />
+    <row values="encrypt| 4" />
+    <row values="shadow| 0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/count_single_table_rule.xml
index 44cd364c4be..64156a3252b 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| encrypt_and_readwrite_splitting| 10"/>
+    <row values="single_table| encrypt_and_readwrite_splitting| 10" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_single_table.xml
index e5717c62a6c..49db67cd29b 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_single_table.xml
@@ -17,8 +17,8 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| readwrite_ds"/>
+    <row values="t_single_table| readwrite_ds" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_single_tables.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_single_tables.xml
index 88e6b2d8ddf..1423ff77d96 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_single_tables.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_single_tables.xml
@@ -17,17 +17,17 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_order_federate| readwrite_ds"/>
-    <row values="t_order_federate_sharding| readwrite_ds"/>
-    <row values="t_order_item_federate| readwrite_ds"/>
-    <row values="t_order_item_federate_sharding| readwrite_ds"/>
-    <row values="t_single_table| readwrite_ds"/>
-    <row values="t_user| readwrite_ds"/>
-    <row values="t_user_encrypt_federate| readwrite_ds"/>
-    <row values="t_user_encrypt_federate_sharding| readwrite_ds"/>
-    <row values="t_user_info| readwrite_ds"/>
-    <row values="t_user_item| readwrite_ds"/>
+    <row values="t_order_federate| readwrite_ds" />
+    <row values="t_order_federate_sharding| readwrite_ds" />
+    <row values="t_order_item_federate| readwrite_ds" />
+    <row values="t_order_item_federate_sharding| readwrite_ds" />
+    <row values="t_single_table| readwrite_ds" />
+    <row values="t_user| readwrite_ds" />
+    <row values="t_user_encrypt_federate| readwrite_ds" />
+    <row values="t_user_encrypt_federate_sharding| readwrite_ds" />
+    <row values="t_user_info| readwrite_ds" />
+    <row values="t_user_item| readwrite_ds" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/count_database_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/count_database_rules.xml
index 77cc30c2eae..e5e759226cb 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/count_database_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/count_database_rules.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| 1"/>
-    <row values="sharding_table| 3"/>
-    <row values="sharding_binding_table| 1"/>
-    <row values="sharding_broadcast_table| 2"/>
-    <row values="readwrite_splitting| 1"/>
-    <row values="db_discovery| 0"/>
-    <row values="encrypt| 0"/>
-    <row values="shadow| 0"/>
+    <row values="single_table| 1" />
+    <row values="sharding_table| 3" />
+    <row values="sharding_binding_table| 1" />
+    <row values="sharding_broadcast_table| 2" />
+    <row values="readwrite_splitting| 1" />
+    <row values="db_discovery| 0" />
+    <row values="encrypt| 0" />
+    <row values="shadow| 0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/count_single_table_rule.xml
index 0fba9672e25..a5f4fc22e75 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| readwrite_splitting| 1"/>
+    <row values="single_table| readwrite_splitting| 1" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_default_sharding_strategy.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_default_sharding_strategy.xml
index b85a6d3cc64..6de4eac3474 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_default_sharding_strategy.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_default_sharding_strategy.xml
@@ -24,6 +24,6 @@
         <column name="sharding_algorithm_type" />
         <column name="sharding_algorithm_props" />
     </metadata>
-    <row values="TABLE| NONE| | | | "/>
-    <row values="DATABASE| NONE| | | | "/>
+    <row values="TABLE| NONE| | | | " />
+    <row values="DATABASE| NONE| | | | " />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_sharding_scaling_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_sharding_scaling_rules.xml
index ac1e9af960e..f0ad119ee0a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_sharding_scaling_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_sharding_scaling_rules.xml
@@ -17,11 +17,11 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="input"/>
-        <column name="output"/>
-        <column name="stream_channel"/>
-        <column name="completion_detector"/>
-        <column name="data_consistency_checker"/>
+        <column name="name" />
+        <column name="input" />
+        <column name="output" />
+        <column name="stream_channel" />
+        <column name="completion_detector" />
+        <column name="data_consistency_checker" />
     </metadata>
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_single_table.xml
index 19dd8000cd0..2053c42b49c 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/readwrite_splitting/show_single_table.xml
@@ -17,8 +17,8 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| write-read-ds"/>
+    <row values="t_single_table| write-read-ds" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_database_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_database_rules.xml
index 49e6475ffd5..532f1d209dd 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_database_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_database_rules.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| 5"/>
-    <row values="sharding_table| 6"/>
-    <row values="sharding_binding_table| 1"/>
-    <row values="sharding_broadcast_table| 0"/>
-    <row values="readwrite_splitting| 0"/>
-    <row values="db_discovery| 0"/>
-    <row values="encrypt| 4"/>
-    <row values="shadow| 0"/>
+    <row values="single_table| 5" />
+    <row values="sharding_table| 6" />
+    <row values="sharding_binding_table| 1" />
+    <row values="sharding_broadcast_table| 0" />
+    <row values="readwrite_splitting| 0" />
+    <row values="db_discovery| 0" />
+    <row values="encrypt| 4" />
+    <row values="shadow| 0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_single_table_rule.xml
index 6416d7bf301..4a340704218 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| sharding_and_encrypt| 5"/>
+    <row values="single_table| sharding_and_encrypt| 5" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_default_sharding_strategy.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_default_sharding_strategy.xml
index b85a6d3cc64..6de4eac3474 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_default_sharding_strategy.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_default_sharding_strategy.xml
@@ -24,6 +24,6 @@
         <column name="sharding_algorithm_type" />
         <column name="sharding_algorithm_props" />
     </metadata>
-    <row values="TABLE| NONE| | | | "/>
-    <row values="DATABASE| NONE| | | | "/>
+    <row values="TABLE| NONE| | | | " />
+    <row values="DATABASE| NONE| | | | " />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_scaling_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_scaling_rules.xml
index ac1e9af960e..f0ad119ee0a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_scaling_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_scaling_rules.xml
@@ -17,11 +17,11 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="input"/>
-        <column name="output"/>
-        <column name="stream_channel"/>
-        <column name="completion_detector"/>
-        <column name="data_consistency_checker"/>
+        <column name="name" />
+        <column name="input" />
+        <column name="output" />
+        <column name="stream_channel" />
+        <column name="completion_detector" />
+        <column name="data_consistency_checker" />
     </metadata>
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_nodes.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_nodes.xml
index 46e57acd7d1..f91f24432e5 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_nodes.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_sharding_table_nodes.xml
@@ -20,10 +20,10 @@
         <column name="name" />
         <column name="nodes" />
     </metadata>
-    <row values="t_user_item| encrypt_ds_0.t_user_item_0, encrypt_ds_0.t_user_item_1, encrypt_ds_0.t_user_item_2, encrypt_ds_0.t_user_item_3, encrypt_ds_0.t_user_item_4, encrypt_ds_0.t_user_item_5, encrypt_ds_0.t_user_item_6, encrypt_ds_0.t_user_item_7, encrypt_ds_0.t_user_item_8, encrypt_ds_0.t_user_item_9, encrypt_ds_1.t_user_item_0, encrypt_ds_1.t_user_item_1, encrypt_ds_1.t_user_item_2, encrypt_ds_1.t_user_item_3, encrypt_ds_1.t_user_item_4, encrypt_ds_1.t_user_item_5, encrypt_ds_1.t [...]
-    <row values="t_user| encrypt_ds_0.t_user_0, encrypt_ds_0.t_user_1, encrypt_ds_0.t_user_2, encrypt_ds_0.t_user_3, encrypt_ds_0.t_user_4, encrypt_ds_0.t_user_5, encrypt_ds_0.t_user_6, encrypt_ds_0.t_user_7, encrypt_ds_0.t_user_8, encrypt_ds_0.t_user_9, encrypt_ds_1.t_user_0, encrypt_ds_1.t_user_1, encrypt_ds_1.t_user_2, encrypt_ds_1.t_user_3, encrypt_ds_1.t_user_4, encrypt_ds_1.t_user_5, encrypt_ds_1.t_user_6, encrypt_ds_1.t_user_7, encrypt_ds_1.t_user_8, encrypt_ds_1.t_user_9, encrypt [...]
-    <row values="t_user_details| encrypt_ds_0.t_user_details_0, encrypt_ds_0.t_user_details_1, encrypt_ds_0.t_user_details_2, encrypt_ds_0.t_user_details_3, encrypt_ds_0.t_user_details_4, encrypt_ds_0.t_user_details_5, encrypt_ds_0.t_user_details_6, encrypt_ds_0.t_user_details_7, encrypt_ds_0.t_user_details_8, encrypt_ds_0.t_user_details_9, encrypt_ds_1.t_user_details_0, encrypt_ds_1.t_user_details_1, encrypt_ds_1.t_user_details_2, encrypt_ds_1.t_user_details_3, encrypt_ds_1.t_user_detai [...]
-    <row values="t_order_item_federate_sharding| encrypt_ds_1.t_order_item_federate_sharding_0, encrypt_ds_1.t_order_item_federate_sharding_1"/>
-    <row values="t_order_federate_sharding| encrypt_ds_1.t_order_federate_sharding_0, encrypt_ds_1.t_order_federate_sharding_1"/>
-    <row values="t_user_encrypt_federate_sharding| encrypt_ds_1.t_user_encrypt_federate_sharding_0, encrypt_ds_1.t_user_encrypt_federate_sharding_1"/>
+    <row values="t_user_item| encrypt_ds_0.t_user_item_0, encrypt_ds_0.t_user_item_1, encrypt_ds_0.t_user_item_2, encrypt_ds_0.t_user_item_3, encrypt_ds_0.t_user_item_4, encrypt_ds_0.t_user_item_5, encrypt_ds_0.t_user_item_6, encrypt_ds_0.t_user_item_7, encrypt_ds_0.t_user_item_8, encrypt_ds_0.t_user_item_9, encrypt_ds_1.t_user_item_0, encrypt_ds_1.t_user_item_1, encrypt_ds_1.t_user_item_2, encrypt_ds_1.t_user_item_3, encrypt_ds_1.t_user_item_4, encrypt_ds_1.t_user_item_5, encrypt_ds_1.t [...]
+    <row values="t_user| encrypt_ds_0.t_user_0, encrypt_ds_0.t_user_1, encrypt_ds_0.t_user_2, encrypt_ds_0.t_user_3, encrypt_ds_0.t_user_4, encrypt_ds_0.t_user_5, encrypt_ds_0.t_user_6, encrypt_ds_0.t_user_7, encrypt_ds_0.t_user_8, encrypt_ds_0.t_user_9, encrypt_ds_1.t_user_0, encrypt_ds_1.t_user_1, encrypt_ds_1.t_user_2, encrypt_ds_1.t_user_3, encrypt_ds_1.t_user_4, encrypt_ds_1.t_user_5, encrypt_ds_1.t_user_6, encrypt_ds_1.t_user_7, encrypt_ds_1.t_user_8, encrypt_ds_1.t_user_9, encrypt [...]
+    <row values="t_user_details| encrypt_ds_0.t_user_details_0, encrypt_ds_0.t_user_details_1, encrypt_ds_0.t_user_details_2, encrypt_ds_0.t_user_details_3, encrypt_ds_0.t_user_details_4, encrypt_ds_0.t_user_details_5, encrypt_ds_0.t_user_details_6, encrypt_ds_0.t_user_details_7, encrypt_ds_0.t_user_details_8, encrypt_ds_0.t_user_details_9, encrypt_ds_1.t_user_details_0, encrypt_ds_1.t_user_details_1, encrypt_ds_1.t_user_details_2, encrypt_ds_1.t_user_details_3, encrypt_ds_1.t_user_detai [...]
+    <row values="t_order_item_federate_sharding| encrypt_ds_1.t_order_item_federate_sharding_0, encrypt_ds_1.t_order_item_federate_sharding_1" />
+    <row values="t_order_federate_sharding| encrypt_ds_1.t_order_federate_sharding_0, encrypt_ds_1.t_order_federate_sharding_1" />
+    <row values="t_user_encrypt_federate_sharding| encrypt_ds_1.t_user_encrypt_federate_sharding_0, encrypt_ds_1.t_user_encrypt_federate_sharding_1" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table.xml
index 0a78a935ed7..9526cd3ae6d 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_table.xml
@@ -17,8 +17,8 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| encrypt_ds_0"/>
+    <row values="t_single_table| encrypt_ds_0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_tables.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_tables.xml
index 536a421db03..62d66ee4ee9 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_tables.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_single_tables.xml
@@ -17,12 +17,12 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_order_federate| encrypt_ds_0"/>
-    <row values="t_order_item_federate| encrypt_ds_1"/>
-    <row values="t_single_table| encrypt_ds_0"/>
-    <row values="t_user_encrypt_federate| encrypt_ds_1"/>
-    <row values="t_user_info| encrypt_ds_1"/>
+    <row values="t_order_federate| encrypt_ds_0" />
+    <row values="t_order_item_federate| encrypt_ds_1" />
+    <row values="t_single_table| encrypt_ds_0" />
+    <row values="t_user_encrypt_federate| encrypt_ds_1" />
+    <row values="t_user_info| encrypt_ds_1" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/count_database_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/count_database_rules.xml
index 77cc30c2eae..e5e759226cb 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/count_database_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/count_database_rules.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| 1"/>
-    <row values="sharding_table| 3"/>
-    <row values="sharding_binding_table| 1"/>
-    <row values="sharding_broadcast_table| 2"/>
-    <row values="readwrite_splitting| 1"/>
-    <row values="db_discovery| 0"/>
-    <row values="encrypt| 0"/>
-    <row values="shadow| 0"/>
+    <row values="single_table| 1" />
+    <row values="sharding_table| 3" />
+    <row values="sharding_binding_table| 1" />
+    <row values="sharding_broadcast_table| 2" />
+    <row values="readwrite_splitting| 1" />
+    <row values="db_discovery| 0" />
+    <row values="encrypt| 0" />
+    <row values="shadow| 0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/count_single_table_rule.xml
index b08b4b3fdfa..187c67c7145 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| db| 3"/>
+    <row values="single_table| db| 3" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_default_sharding_strategy.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_default_sharding_strategy.xml
index b85a6d3cc64..6de4eac3474 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_default_sharding_strategy.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_default_sharding_strategy.xml
@@ -24,6 +24,6 @@
         <column name="sharding_algorithm_type" />
         <column name="sharding_algorithm_props" />
     </metadata>
-    <row values="TABLE| NONE| | | | "/>
-    <row values="DATABASE| NONE| | | | "/>
+    <row values="TABLE| NONE| | | | " />
+    <row values="DATABASE| NONE| | | | " />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_sharding_scaling_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_sharding_scaling_rules.xml
index ac1e9af960e..f0ad119ee0a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_sharding_scaling_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_sharding_scaling_rules.xml
@@ -17,11 +17,11 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="input"/>
-        <column name="output"/>
-        <column name="stream_channel"/>
-        <column name="completion_detector"/>
-        <column name="data_consistency_checker"/>
+        <column name="name" />
+        <column name="input" />
+        <column name="output" />
+        <column name="stream_channel" />
+        <column name="completion_detector" />
+        <column name="data_consistency_checker" />
     </metadata>
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_single_table.xml
index c791214e320..cda2b873ca8 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_governance/mysql/show_single_table.xml
@@ -17,7 +17,7 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/count_database_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/count_database_rules.xml
index 493efbf3df8..75bffe83e73 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/count_database_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/count_database_rules.xml
@@ -17,15 +17,15 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| 1"/>
-    <row values="sharding_table| 5"/>
-    <row values="sharding_binding_table| 1"/>
-    <row values="sharding_broadcast_table| 2"/>
-    <row values="readwrite_splitting| 0"/>
-    <row values="db_discovery| 0"/>
-    <row values="encrypt| 0"/>
-    <row values="shadow| 0"/>
+    <row values="single_table| 1" />
+    <row values="sharding_table| 5" />
+    <row values="sharding_binding_table| 1" />
+    <row values="sharding_broadcast_table| 2" />
+    <row values="readwrite_splitting| 0" />
+    <row values="db_discovery| 0" />
+    <row values="encrypt| 0" />
+    <row values="shadow| 0" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/count_single_table_rule.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/count_single_table_rule.xml
index 7913d252c80..bb6b6ac4d2c 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/count_single_table_rule.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/count_single_table_rule.xml
@@ -17,9 +17,9 @@
 
 <dataset>
     <metadata>
-        <column name="rule_name"/>
-        <column name="database"/>
-        <column name="count"/>
+        <column name="rule_name" />
+        <column name="database" />
+        <column name="count" />
     </metadata>
-    <row values="single_table| tbl| 1"/>
+    <row values="single_table| tbl| 1" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_default_sharding_strategy.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_default_sharding_strategy.xml
index b85a6d3cc64..6de4eac3474 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_default_sharding_strategy.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_default_sharding_strategy.xml
@@ -24,6 +24,6 @@
         <column name="sharding_algorithm_type" />
         <column name="sharding_algorithm_props" />
     </metadata>
-    <row values="TABLE| NONE| | | | "/>
-    <row values="DATABASE| NONE| | | | "/>
+    <row values="TABLE| NONE| | | | " />
+    <row values="DATABASE| NONE| | | | " />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_sharding_scaling_rules.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_sharding_scaling_rules.xml
index ac1e9af960e..f0ad119ee0a 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_sharding_scaling_rules.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_sharding_scaling_rules.xml
@@ -17,11 +17,11 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="input"/>
-        <column name="output"/>
-        <column name="stream_channel"/>
-        <column name="completion_detector"/>
-        <column name="data_consistency_checker"/>
+        <column name="name" />
+        <column name="input" />
+        <column name="output" />
+        <column name="stream_channel" />
+        <column name="completion_detector" />
+        <column name="data_consistency_checker" />
     </metadata>
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_nodes.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_nodes.xml
index c50c2a8024a..4df86ae7fef 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_nodes.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_sharding_table_nodes.xml
@@ -17,12 +17,12 @@
 
 <dataset>
     <metadata>
-        <column name="name"/>
-        <column name="nodes"/>
+        <column name="name" />
+        <column name="nodes" />
     </metadata>
-    <row values="t_order| tbl.t_order_0, tbl.t_order_1, tbl.t_order_2, tbl.t_order_3, tbl.t_order_4, tbl.t_order_5, tbl.t_order_6, tbl.t_order_7, tbl.t_order_8, tbl.t_order_9"/>
-    <row values="t_order_item| tbl.t_order_item_0, tbl.t_order_item_1, tbl.t_order_item_2, tbl.t_order_item_3, tbl.t_order_item_4, tbl.t_order_item_5, tbl.t_order_item_6, tbl.t_order_item_7, tbl.t_order_item_8, tbl.t_order_item_9"/>
-    <row values="t_order_details| tbl.t_order_details_0, tbl.t_order_details_1, tbl.t_order_details_2, tbl.t_order_details_3, tbl.t_order_details_4, tbl.t_order_details_5, tbl.t_order_details_6, tbl.t_order_details_7, tbl.t_order_details_8, tbl.t_order_details_9"/>
-    <row values="t_order_federate_sharding| tbl.t_order_federate_sharding_0, tbl.t_order_federate_sharding_1"/>
-    <row values="t_order_item_federate_sharding| tbl.t_order_item_federate_sharding_0, tbl.t_order_item_federate_sharding_1"/>
+    <row values="t_order| tbl.t_order_0, tbl.t_order_1, tbl.t_order_2, tbl.t_order_3, tbl.t_order_4, tbl.t_order_5, tbl.t_order_6, tbl.t_order_7, tbl.t_order_8, tbl.t_order_9" />
+    <row values="t_order_item| tbl.t_order_item_0, tbl.t_order_item_1, tbl.t_order_item_2, tbl.t_order_item_3, tbl.t_order_item_4, tbl.t_order_item_5, tbl.t_order_item_6, tbl.t_order_item_7, tbl.t_order_item_8, tbl.t_order_item_9" />
+    <row values="t_order_details| tbl.t_order_details_0, tbl.t_order_details_1, tbl.t_order_details_2, tbl.t_order_details_3, tbl.t_order_details_4, tbl.t_order_details_5, tbl.t_order_details_6, tbl.t_order_details_7, tbl.t_order_details_8, tbl.t_order_details_9" />
+    <row values="t_order_federate_sharding| tbl.t_order_federate_sharding_0, tbl.t_order_federate_sharding_1" />
+    <row values="t_order_item_federate_sharding| tbl.t_order_item_federate_sharding_0, tbl.t_order_item_federate_sharding_1" />
 </dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_single_table.xml b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_single_table.xml
index a6738cab04c..366d068001d 100644
--- a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_single_table.xml
+++ b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/tbl/show_single_table.xml
@@ -17,8 +17,8 @@
 
 <dataset>
     <metadata>
-        <column name="table_name"/>
-        <column name="resource_name"/>
+        <column name="table_name" />
+        <column name="resource_name" />
     </metadata>
-    <row values="t_single_table| tbl"/>
+    <row values="t_single_table| tbl" />
 </dataset>
diff --git a/test/integration-test/transaction/src/test/resources/jbossts-properties.xml b/test/integration-test/transaction/src/test/resources/jbossts-properties.xml
index 5bd924ed250..68a0e7a4135 100644
--- a/test/integration-test/transaction/src/test/resources/jbossts-properties.xml
+++ b/test/integration-test/transaction/src/test/resources/jbossts-properties.xml
@@ -34,9 +34,9 @@
         com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner
     </entry>
     <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry>
-    <entry key="RecoveryEnvironmentBean.recoveryAddress"/>
+    <entry key="RecoveryEnvironmentBean.recoveryAddress" />
     <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry>
-    <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"/>
+    <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress" />
     <entry key="RecoveryEnvironmentBean.recoveryListener">NO</entry>
     <entry key="RecoveryEnvironmentBean.recoveryBackoffPeriod">1</entry>
 </properties>
diff --git a/test/integration-test/transaction/src/test/resources/logback-test.xml b/test/integration-test/transaction/src/test/resources/logback-test.xml
index 898bedb2c5e..34c662c23f1 100644
--- a/test/integration-test/transaction/src/test/resources/logback-test.xml
+++ b/test/integration-test/transaction/src/test/resources/logback-test.xml
@@ -24,8 +24,8 @@
     </appender>
     <logger name="org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer" level="WARN" />
     <logger name="com.zaxxer.hikari.pool.ProxyConnection" level="OFF" />
-    <logger name="org.testcontainers" level="INFO"/>
-    <logger name="com.github.dockerjava" level="WARN"/>
+    <logger name="org.testcontainers" level="INFO" />
+    <logger name="com.github.dockerjava" level="WARN" />
     <root>
         <level value="INFO" />
         <appender-ref ref="console" />
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/loader/SQLCasesLoader.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/loader/SQLCasesLoader.java
index 0cbe84c5831..c4af7457f19 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/loader/SQLCasesLoader.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/loader/SQLCasesLoader.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.sql.parser.internal.cases.sql.loader;
 
 import com.google.common.base.Preconditions;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.sql.parser.internal.cases.sql.jaxb.SQLCase;
 import org.apache.shardingsphere.test.sql.parser.internal.cases.sql.jaxb.RootSQLCases;
+import org.apache.shardingsphere.test.sql.parser.internal.cases.sql.jaxb.SQLCase;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
diff --git a/test/parser/src/main/resources/case/dal/explain.xml b/test/parser/src/main/resources/case/dal/explain.xml
index 8f26c0d300e..c637e9d02a3 100644
--- a/test/parser/src/main/resources/case/dal/explain.xml
+++ b/test/parser/src/main/resources/case/dal/explain.xml
@@ -28,7 +28,7 @@
     <describe sql-case-id="explain_update_without_condition">
         <update>
             <table start-index="15" stop-index="21">
-                <simple-table name="t_order" start-index="15" stop-index="21"/>
+                <simple-table name="t_order" start-index="15" stop-index="21" />
             </table>
             <set start-index="23" stop-index="45">
                 <assignment start-index="23" stop-index="45">
@@ -129,10 +129,10 @@
             <table name="t_order_new" start-index="21" stop-index="31" />
             <select>
                 <from>
-                    <simple-table name="t_order" start-index="186" stop-index="192"/>
+                    <simple-table name="t_order" start-index="186" stop-index="192" />
                 </from>
                 <projections start-index="179" stop-index="179">
-                    <shorthand-projection start-index="179" stop-index="179"/>
+                    <shorthand-projection start-index="179" stop-index="179" />
                 </projections>
             </select>
         </create-table>
@@ -145,11 +145,11 @@
             <column name="user_id_new" start-index="48" stop-index="58" />
             <select>
                 <from>
-                    <simple-table name="t_order" start-index="230" stop-index="236"/>
+                    <simple-table name="t_order" start-index="230" stop-index="236" />
                 </from>
                 <projections start-index="207" stop-index="223">
-                    <column-projection name="order_id" start-index="207" stop-index="214"/>
-                    <column-projection name="user_id" start-index="217" stop-index="223"/>
+                    <column-projection name="order_id" start-index="207" stop-index="214" />
+                    <column-projection name="user_id" start-index="217" stop-index="223" />
                 </projections>
             </select>
         </create-table>
@@ -198,7 +198,7 @@
                 <shorthand-projection start-index="23" stop-index="23" />
             </projections>
             <from>
-                <simple-table name="t_order" start-index="30" stop-index="36"/>
+                <simple-table name="t_order" start-index="30" stop-index="36" />
             </from>
             <where start-index="38" stop-index="55">
                 <expr>
@@ -221,7 +221,7 @@
                 <shorthand-projection start-index="37" stop-index="37" />
             </projections>
             <from>
-                <simple-table name="t_order" start-index="44" stop-index="50"/>
+                <simple-table name="t_order" start-index="44" stop-index="50" />
             </from>
             <where start-index="52" stop-index="69">
                 <expr>
@@ -277,11 +277,11 @@
             </order-by>
             <limit start-index="40" stop-index="55">
                 <offset value="2" literal-start-index="55" literal-stop-index="55" />
-                <row-count value="1" start-index="46" stop-index="46"/>
+                <row-count value="1" start-index="46" stop-index="46" />
             </limit>
         </select>
     </describe>
     
-    <describe sql-case-id="explain_create_materialized_view_with_data"/>
-    <describe sql-case-id="explain_create_materialized_view_with_no_data"/>
+    <describe sql-case-id="explain_create_materialized_view_with_data" />
+    <describe sql-case-id="explain_create_materialized_view_with_no_data" />
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dal/install.xml b/test/parser/src/main/resources/case/dal/install.xml
index 986311e3323..7386a992843 100644
--- a/test/parser/src/main/resources/case/dal/install.xml
+++ b/test/parser/src/main/resources/case/dal/install.xml
@@ -18,15 +18,15 @@
 
 <sql-parser-test-cases>
     <install-component sql-case-id="install_component">
-        <component name="file://component1" start-index="18" stop-index="36"/>
+        <component name="file://component1" start-index="18" stop-index="36" />
     </install-component>
     
     <install-component sql-case-id="install_components">
-        <component name="file://component1" start-index="18" stop-index="36"/>
-        <component name="file://component2" start-index="39" stop-index="57"/>
+        <component name="file://component1" start-index="18" stop-index="36" />
+        <component name="file://component2" start-index="39" stop-index="57" />
     </install-component>
     
     <install-plugin sql-case-id="install_plugin">
-        <plugin name="binlog" start-index="15" stop-index="20"/>
+        <plugin name="binlog" start-index="15" stop-index="20" />
     </install-plugin>
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dal/show.xml b/test/parser/src/main/resources/case/dal/show.xml
index fd9cabd15ce..9a50c696312 100644
--- a/test/parser/src/main/resources/case/dal/show.xml
+++ b/test/parser/src/main/resources/case/dal/show.xml
@@ -49,7 +49,7 @@
     </show-index>
 
     <show-columns sql-case-id="show_columns_from_table">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26" />
     </show-columns>
 
     <show-columns sql-case-id="show_columns_from_table_with_owner">
@@ -59,19 +59,19 @@
     </show-columns>
 
     <show-columns sql-case-id="show_columns_with_schema">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26"/>
-        <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="33" stop-index="45"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26" />
+        <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="33" stop-index="45" />
     </show-columns>
 
     <show-columns sql-case-id="show_columns_with_like_pattern">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26" />
         <filter start-index="28" stop-index="41">
-            <like pattern="order_%" start-delimiter="'" end-delimiter="'" start-index="28" stop-index="41"/>
+            <like pattern="order_%" start-delimiter="'" end-delimiter="'" start-index="28" stop-index="41" />
         </filter>
     </show-columns>
     
     <show-columns sql-case-id="show_columns_with_where_expr" parameters="'order_id'">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26" />
         <filter start-index="28" stop-index="42" literal-stop-index="51">
             <where start-index="28" stop-index="42" literal-stop-index="51">
                 <expr>
@@ -91,7 +91,7 @@
     </show-columns>
     
     <show-columns sql-case-id="show_columns_by_fields_from_table">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="25"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="25" />
     </show-columns>
 
     <show-columns sql-case-id="show_columns_by_fields_from_table_with_owner">
@@ -101,19 +101,19 @@
     </show-columns>
 
     <show-columns sql-case-id="show_columns_by_fields_with_schema">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="25"/>
-        <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="32" stop-index="44"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="25" />
+        <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="32" stop-index="44" />
     </show-columns>
 
     <show-columns sql-case-id="show_columns_by_fields_with_like_pattern">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="25"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="25" />
         <filter start-index="27" stop-index="40">
-            <like pattern="order_%" start-delimiter="'" end-delimiter="'" start-index="27" stop-index="40"/>
+            <like pattern="order_%" start-delimiter="'" end-delimiter="'" start-index="27" stop-index="40" />
         </filter>
     </show-columns>
 
     <show-columns sql-case-id="show_columns_by_fields_with_where_expr" parameters="'order_id'">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="25"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="25" />
         <filter start-index="27" stop-index="41" literal-stop-index="50">
             <where start-index="27" stop-index="41" literal-stop-index="50">
                 <expr>
@@ -133,7 +133,7 @@
     </show-columns>
 
     <show-create-table sql-case-id="show_create_table">
-        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26"/>
+        <table name="t_order" start-delimiter="`" end-delimiter="`" start-index="18" stop-index="26" />
     </show-create-table>
 
     <show-create-trigger sql-case-id="show_create_trigger">
@@ -156,7 +156,7 @@
 
     <show-databases sql-case-id="show_databases_with_like">
         <filter start-index="15" stop-index="32">
-            <like pattern="sharding_db" start-delimiter="'" end-delimiter="'" start-index="15" stop-index="32"/>
+            <like pattern="sharding_db" start-delimiter="'" end-delimiter="'" start-index="15" stop-index="32" />
         </filter>
     </show-databases>
 
@@ -293,41 +293,41 @@
     </show-procedure-code>
     <show-procedure-code sql-case-id="show_procedure_code_owner_func">
         <function function-name="TEST_FUNC" start-index="20" stop-index="38" text="TEST_USER.TEST_FUNC">
-            <owner name="TEST_USER" start-index="20" stop-index="28"/>
+            <owner name="TEST_USER" start-index="20" stop-index="28" />
         </function>
     </show-procedure-code>
     <show-relay-log-events sql-case-id="show_relay-log_events" channel="TEST_CHANNEL" />
     <show-relay-log-events sql-case-id="show_relay-log_events_with_log" channel="TEST_CHANNEL" log-name="TEST_LOG" />
     <show-slave-hosts sql-case-id="show_slave_hosts" />
     <show-replica-status sql-case-id="show_replica_status" />
-    <show-replica-status sql-case-id="show_replica_status_with_channel" channel="TEST_CHANNEL"/>
+    <show-replica-status sql-case-id="show_replica_status_with_channel" channel="TEST_CHANNEL" />
     <show-slave-status sql-case-id="show_slave_status" />
     <show-slave-status sql-case-id="show_slave_status_with_channel" channel="TEST_CHANNEL" />
 
     <show-open-tables sql-case-id="show_open_tables_from_schema">
         <from start-index="17" stop-index="34">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="22" stop-index="34"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="22" stop-index="34" />
         </from>
     </show-open-tables>
 
     <show-open-tables sql-case-id="show_open_tables_in_schema">
         <from start-index="17" stop-index="32">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="20" stop-index="32"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="20" stop-index="32" />
         </from>
     </show-open-tables>
 
     <show-open-tables sql-case-id="show_open_tables_with_like_pattern">
         <from start-index="17" stop-index="34">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="22" stop-index="34"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="22" stop-index="34" />
         </from>
         <filter start-index="36" stop-index="51">
-            <like pattern="t_order_%" start-delimiter="'" end-delimiter="'" start-index="36" stop-index="51"/>
+            <like pattern="t_order_%" start-delimiter="'" end-delimiter="'" start-index="36" stop-index="51" />
         </filter>
     </show-open-tables>
 
     <show-open-tables sql-case-id="show_open_tables_with_where_expr" parameters="'t_order'">
         <from start-index="17" stop-index="34">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="22" stop-index="34"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="22" stop-index="34" />
         </from>
         <filter start-index="36" stop-index="52" literal-start-index="36" literal-stop-index="60">
             <where start-index="36" stop-index="52" literal-start-index="36" literal-stop-index="60">
@@ -349,7 +349,7 @@
 
     <show-open-tables sql-case-id="show_open_tables_with_where_expr_no_parameter">
         <from start-index="17" stop-index="34">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="22" stop-index="34"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="22" stop-index="34" />
         </from>
         <filter start-index="36" stop-index="60">
             <where start-index="36" stop-index="60">
@@ -444,28 +444,28 @@
 
     <show-table-status sql-case-id="show_table_status_from_schema">
         <from start-index="18" stop-index="35">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="23" stop-index="35"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="23" stop-index="35" />
         </from>
     </show-table-status>
 
     <show-table-status sql-case-id="show_table_status_in_schema">
         <from start-index="18" stop-index="33">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="21" stop-index="33"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="21" stop-index="33" />
         </from>
     </show-table-status>
 
     <show-table-status sql-case-id="show_table_status_with_like_pattern">
         <from start-index="18" stop-index="35">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="23" stop-index="35"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="23" stop-index="35" />
         </from>
         <filter start-index="37" stop-index="52">
-            <like pattern="t_order_%" start-delimiter="'" end-delimiter="'" start-index="37" stop-index="52"/>
+            <like pattern="t_order_%" start-delimiter="'" end-delimiter="'" start-index="37" stop-index="52" />
         </filter>
     </show-table-status>
 
     <show-table-status sql-case-id="show_table_status_with_where_expr" parameters="'t_order'">
         <from start-index="18" stop-index="35">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="23" stop-index="35"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="23" stop-index="35" />
         </from>
         <filter start-index="37" stop-index="52" literal-start-index="37" literal-stop-index="60">
             <where start-index="37" stop-index="52" literal-start-index="37" literal-stop-index="60">
@@ -487,7 +487,7 @@
 
     <show-table-status sql-case-id="show_table_status_with_where_expr_no_parameter">
         <from start-index="18" stop-index="35">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="23" stop-index="35"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="23" stop-index="35" />
         </from>
         <filter start-index="37" stop-index="60">
             <where start-index="37" stop-index="60">
@@ -507,9 +507,9 @@
     </show-table-status>
 
 
-    <show-status sql-case-id="show_global_status"/>
+    <show-status sql-case-id="show_global_status" />
 
-    <show-status sql-case-id="show_session_status"/>
+    <show-status sql-case-id="show_session_status" />
 
     <show-status sql-case-id="show_status_with_like_pattern">
         <filter start-index="19" stop-index="29">
@@ -558,34 +558,34 @@
 
     <show-events sql-case-id="show_events_from_schema">
         <from start-index="12" stop-index="29">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29" />
         </from>
     </show-events>
 
     <show-events sql-case-id="show_events_in_schema">
         <from start-index="12" stop-index="27">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="15" stop-index="27"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="15" stop-index="27" />
         </from>
     </show-events>
 
     <show-events sql-case-id="show_events_no_schema">
         <filter start-index="12" stop-index="28">
-            <like pattern="sharding_%" start-delimiter="'" end-delimiter="'" start-index="12" stop-index="28"/>
+            <like pattern="sharding_%" start-delimiter="'" end-delimiter="'" start-index="12" stop-index="28" />
         </filter>
     </show-events>
 
     <show-events sql-case-id="show_events_with_like_pattern">
         <from start-index="12" stop-index="29">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29" />
         </from>
         <filter start-index="31" stop-index="47">
-            <like pattern="sharding_%" start-delimiter="'" end-delimiter="'" start-index="31" stop-index="47"/>
+            <like pattern="sharding_%" start-delimiter="'" end-delimiter="'" start-index="31" stop-index="47" />
         </filter>
     </show-events>
 
     <show-events sql-case-id="show_events_with_where_expr" parameters="'sharding_db'">
         <from start-index="12" stop-index="29">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29" />
         </from>
         <filter start-index="31" stop-index="42" literal-start-index="31" literal-stop-index="54">
             <where start-index="31" stop-index="42" literal-start-index="31" literal-stop-index="54">
@@ -607,7 +607,7 @@
 
     <show-events sql-case-id="show_events_with_where_expr_no_parameter">
         <from start-index="12" stop-index="29">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29" />
         </from>
         <filter start-index="31" stop-index="54">
             <where start-index="31" stop-index="54">
@@ -632,29 +632,29 @@
 
     <show-tables sql-case-id="show_tables_from_schema">
         <from start-index="12" stop-index="29">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29" />
         </from>
     </show-tables>
 
     <show-tables sql-case-id="show_tables_in_schema">
         <from start-index="12" stop-index="27">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="15" stop-index="27"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="15" stop-index="27" />
         </from>
     </show-tables>
 
 
     <show-tables sql-case-id="show_tables_with_like_pattern">
         <from start-index="12" stop-index="29">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="17" stop-index="29" />
         </from>
         <filter start-index="31" stop-index="46">
-            <like pattern="t_order_%" start-delimiter="'" end-delimiter="'" start-index="31" stop-index="46"/>
+            <like pattern="t_order_%" start-delimiter="'" end-delimiter="'" start-index="31" stop-index="46" />
         </filter>
     </show-tables>
 
     <show-tables sql-case-id="show_tables_with_where_expr" parameters="'BASE TABLE'">
         <from start-index="26" stop-index="43">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="31" stop-index="43"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="31" stop-index="43" />
         </from>
         <filter start-index="45" stop-index="66" literal-start-index="45" literal-stop-index="77">
             <where start-index="45" stop-index="66" literal-start-index="45" literal-stop-index="77">
@@ -676,7 +676,7 @@
 
     <show-tables sql-case-id="show_tables_with_where_expr_no_parameter">
         <from start-index="26" stop-index="43">
-            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="31" stop-index="43"/>
+            <schema name="sharding_db" start-delimiter="`" end-delimiter="`" start-index="31" stop-index="43" />
         </from>
         <filter start-index="45" stop-index="77">
             <where start-index="45" stop-index="77">
@@ -699,7 +699,7 @@
 
     <show-character-set sql-case-id="show_character_set_with_like_pattern">
         <filter start-index="19" stop-index="31">
-            <like pattern="latin%" start-delimiter="'" end-delimiter="'" start-index="19" stop-index="31"/>
+            <like pattern="latin%" start-delimiter="'" end-delimiter="'" start-index="19" stop-index="31" />
         </filter>
     </show-character-set>
 
@@ -744,7 +744,7 @@
 
     <show-collation sql-case-id="show_collation_with_like_pattern">
         <filter start-index="15" stop-index="27">
-            <like pattern="latin%" start-delimiter="'" end-delimiter="'" start-index="15" stop-index="27"/>
+            <like pattern="latin%" start-delimiter="'" end-delimiter="'" start-index="15" stop-index="27" />
         </filter>
     </show-collation>
 
@@ -793,7 +793,7 @@
 
     <show-variables sql-case-id="show_variables_with_like_pattern">
         <filter start-index="23" stop-index="35">
-            <like pattern="%size%" start-delimiter="'" end-delimiter="'" start-index="23" stop-index="35"/>
+            <like pattern="%size%" start-delimiter="'" end-delimiter="'" start-index="23" stop-index="35" />
         </filter>
     </show-variables>
 
diff --git a/test/parser/src/main/resources/case/dal/uninstall.xml b/test/parser/src/main/resources/case/dal/uninstall.xml
index 3f54e1a2d02..635ccbdc0dd 100644
--- a/test/parser/src/main/resources/case/dal/uninstall.xml
+++ b/test/parser/src/main/resources/case/dal/uninstall.xml
@@ -18,15 +18,15 @@
 
 <sql-parser-test-cases>
     <uninstall-component sql-case-id="uninstall_component">
-        <component name="file://component1" start-index="20" stop-index="38"/>
+        <component name="file://component1" start-index="20" stop-index="38" />
     </uninstall-component>
 
     <uninstall-component sql-case-id="uninstall_components">
-        <component name="file://component1" start-index="20" stop-index="38"/>
-        <component name="file://component2" start-index="41" stop-index="59"/>
+        <component name="file://component1" start-index="20" stop-index="38" />
+        <component name="file://component2" start-index="41" stop-index="59" />
     </uninstall-component>
 
     <uninstall-plugin sql-case-id="uninstall_plugin">
-        <plugin name="binlog" start-index="17" stop-index="27"/>
+        <plugin name="binlog" start-index="17" stop-index="27" />
     </uninstall-plugin>
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dcl/alter-login.xml b/test/parser/src/main/resources/case/dcl/alter-login.xml
index a8c07ac6d23..11eec82d2df 100644
--- a/test/parser/src/main/resources/case/dcl/alter-login.xml
+++ b/test/parser/src/main/resources/case/dcl/alter-login.xml
@@ -18,50 +18,50 @@
 
 <sql-parser-test-cases>
     <alter-login sql-case-id="alter_login_enable">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_set_password">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_set_hashed_password">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_set_password_with_old_password">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_set_default_database">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_add_credential">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_drop_credential">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_unlock">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_rename">
-        <login name="login1_bak" start-index="12" stop-index="21"/>
+        <login name="login1_bak" start-index="12" stop-index="21" />
     </alter-login>
     
     <alter-login sql-case-id="alter_login_with_credential">
-        <login name="login1" start-index="12" stop-index="17"/>
+        <login name="login1" start-index="12" stop-index="17" />
     </alter-login>
 
     <alter-login sql-case-id="alter_login_check_policy">
-        <login name="[login1]" start-index="12" stop-index="19"/>
+        <login name="[login1]" start-index="12" stop-index="19" />
     </alter-login>
 
     <alter-login sql-case-id="alter_login_disable">
-        <login name="[user@contoso.com]" start-index="12" stop-index="29"/>
+        <login name="[user@contoso.com]" start-index="12" stop-index="29" />
     </alter-login>
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dcl/alter-role.xml b/test/parser/src/main/resources/case/dcl/alter-role.xml
index ad10c0c65ba..2dc8c0896d8 100644
--- a/test/parser/src/main/resources/case/dcl/alter-role.xml
+++ b/test/parser/src/main/resources/case/dcl/alter-role.xml
@@ -19,7 +19,7 @@
 <sql-parser-test-cases>
     <alter-role sql-case-id="alter_no_identified_role" />
     <alter-role sql-case-id="alter_external_role" />
-    <alter-role sql-case-id="alter_role_globally"/>
+    <alter-role sql-case-id="alter_role_globally" />
     <alter-role sql-case-id="alter_role_with_password" />
     <alter-role sql-case-id="alter_role_with_container" />
     <alter-role sql-case-id="alter_role_with_password_postgresql" />
diff --git a/test/parser/src/main/resources/case/dcl/create-login.xml b/test/parser/src/main/resources/case/dcl/create-login.xml
index 01ed338c9af..4307f49fd5c 100644
--- a/test/parser/src/main/resources/case/dcl/create-login.xml
+++ b/test/parser/src/main/resources/case/dcl/create-login.xml
@@ -18,50 +18,50 @@
 
 <sql-parser-test-cases>
     <create-login sql-case-id="create_login">
-        <login name="login_dev_new" start-index="13" stop-index="25"/>
+        <login name="login_dev_new" start-index="13" stop-index="25" />
     </create-login>
     
     <create-login sql-case-id="create_login_with_password">
-        <login name="login1" start-index="13" stop-index="18"/>
+        <login name="login1" start-index="13" stop-index="18" />
     </create-login>
     
     <create-login sql-case-id="create_login_with_hashed_password">
-        <login name="login1" start-index="13" stop-index="18"/>
+        <login name="login1" start-index="13" stop-index="18" />
     </create-login>
     
     <create-login sql-case-id="create_login_with_default_database">
-        <login name="login1" start-index="13" stop-index="18"/>
+        <login name="login1" start-index="13" stop-index="18" />
     </create-login>
     
     <create-login sql-case-id="create_login_with_expired_password">
-        <login name="login1" start-index="13" stop-index="18"/>
+        <login name="login1" start-index="13" stop-index="18" />
     </create-login>
     
     <create-login sql-case-id="create_login_to_credential">
-        <login name="login1" start-index="13" stop-index="18"/>
+        <login name="login1" start-index="13" stop-index="18" />
     </create-login>
 
     <create-login sql-case-id="create_login_with_windows">
-        <login name="[domain\login1]" start-index="13" stop-index="27"/>
+        <login name="[domain\login1]" start-index="13" stop-index="27" />
     </create-login>
     
     <create-login sql-case-id="create_login_with_certificate">
-        <login name="login1" start-index="13" stop-index="18"/>
+        <login name="login1" start-index="13" stop-index="18" />
     </create-login>
     
     <create-login sql-case-id="create_login_with_asym_key">
-        <login name="login1" start-index="13" stop-index="18"/>
+        <login name="login1" start-index="13" stop-index="18" />
     </create-login>
 
     <create-login sql-case-id="create_login_with_sid">
-        <login name="login1" start-index="13" stop-index="18"/>
+        <login name="login1" start-index="13" stop-index="18" />
     </create-login>
     
     <create-login sql-case-id="create_login_with_multiple_arguments">
-        <login name="[login1]" start-index="13" stop-index="20"/>
+        <login name="[login1]" start-index="13" stop-index="20" />
     </create-login>
 
     <create-login sql-case-id="create_login_from_external_provider">
-        <login name="[bob@contoso.com]" start-index="13" stop-index="29"/>
+        <login name="[bob@contoso.com]" start-index="13" stop-index="29" />
     </create-login>
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dcl/grant.xml b/test/parser/src/main/resources/case/dcl/grant.xml
index 763ccb75452..de6767d0d29 100644
--- a/test/parser/src/main/resources/case/dcl/grant.xml
+++ b/test/parser/src/main/resources/case/dcl/grant.xml
@@ -116,7 +116,7 @@
         <table name="t_order_item" start-index="31" stop-index="42" />
     </grant>
     
-    <grant sql-case-id="grant_select_on_all_tables"/>
+    <grant sql-case-id="grant_select_on_all_tables" />
     
     <grant sql-case-id="grant_all_column_on_table">
         <table name="t_order" start-index="41" stop-index="47" />
diff --git a/test/parser/src/main/resources/case/dcl/revoke.xml b/test/parser/src/main/resources/case/dcl/revoke.xml
index cfa834323d6..2066c459756 100644
--- a/test/parser/src/main/resources/case/dcl/revoke.xml
+++ b/test/parser/src/main/resources/case/dcl/revoke.xml
@@ -56,7 +56,7 @@
     </revoke>
     
     <revoke sql-case-id="revoke_role_from_user" />
-    <revoke sql-case-id="revoke_roles_from_users"/>
+    <revoke sql-case-id="revoke_roles_from_users" />
     <revoke sql-case-id="revoke_system_privilege" />
     <revoke sql-case-id="revoke_system_privileges" />
     <revoke sql-case-id="revoke_all_system_privileges" />
diff --git a/test/parser/src/main/resources/case/ddl/alter-table.xml b/test/parser/src/main/resources/case/ddl/alter-table.xml
index 2f0e9e20531..944e97b3be5 100644
--- a/test/parser/src/main/resources/case/ddl/alter-table.xml
+++ b/test/parser/src/main/resources/case/ddl/alter-table.xml
@@ -550,14 +550,14 @@
     <alter-table sql-case-id="alter_table_add_unique_key">
         <table name="t_order" start-index="12" stop-index="18" />
         <add-constraint constraint-name="uk_order_id" start-index="24" stop-index="63" >
-            <index-column name="order_id" start-index="55" stop-index="62"/>
+            <index-column name="order_id" start-index="55" stop-index="62" />
         </add-constraint>
     </alter-table>
     
     <alter-table sql-case-id="alter_table_add_foreign_key">
         <table name="t_order_item" start-index="12" stop-index="23" />
         <add-constraint constraint-name="fk_order_id" start-index="29" stop-index="121">
-            <referenced-table name="t_order" stop-index="92" start-index="86"/>
+            <referenced-table name="t_order" stop-index="92" start-index="86" />
         </add-constraint>
     </alter-table>
     
@@ -567,7 +567,7 @@
             <primary-key-column name="order_id" start-index="42" stop-index="49" />
         </add-constraint>
         <add-constraint start-index="56" stop-index="72" >
-            <index-column name="order_id" start-index="64" stop-index="71"/>
+            <index-column name="order_id" start-index="64" stop-index="71" />
         </add-constraint>
         <add-constraint start-index="79" stop-index="166">
             <referenced-table name="t_order" start-index="113" stop-index="119" />
@@ -593,7 +593,7 @@
             <column-definition type="real" start-index="19" stop-index="35">
                 <column name="c2" />
             </column-definition>
-            <column-position start-index="37" stop-index="41"/>
+            <column-position start-index="37" stop-index="41" />
         </add-column>
     </alter-table>
     
@@ -604,7 +604,7 @@
                 <column name="c4" />
             </column-definition>
             <column-position start-index="37" stop-index="44">
-                <column name="c2"/>
+                <column name="c2" />
             </column-position>
         </add-column>
     </alter-table>
@@ -742,7 +742,7 @@
     
     <alter-table sql-case-id="alter_table_add_check">
         <table name="t_order" start-index="12" stop-index="18" />
-        <add-constraint constraint-name="chk_order_id" start-index="24" stop-index="67"/>
+        <add-constraint constraint-name="chk_order_id" start-index="24" stop-index="67" />
     </alter-table>
     
     <alter-table sql-case-id="alter_table_add_columns_oracle">
@@ -792,16 +792,16 @@
     <alter-table sql-case-id="alter_table_add_primary_foreign_key">
         <table name="t_order_item" start-index="12" stop-index="23" />
         <add-constraint start-index="29" stop-index="50">
-            <primary-key-column name="order_id" start-index="42" stop-index="49"/>
+            <primary-key-column name="order_id" start-index="42" stop-index="49" />
         </add-constraint>
         <add-constraint start-index="52" stop-index="68">
             <index-column name="order_id" start-index="60" stop-index="67" />
         </add-constraint>
-        <add-constraint start-index="70" stop-index="89"/>
+        <add-constraint start-index="70" stop-index="89" />
         <add-constraint start-index="91" stop-index="160">
-            <referenced-table name="t_order" start-index="125" stop-index="131"/>
+            <referenced-table name="t_order" start-index="125" stop-index="131" />
         </add-constraint>
-        <add-constraint start-index="162" stop-index="181"/>
+        <add-constraint start-index="162" stop-index="181" />
     </alter-table>
     
     <alter-table sql-case-id="alter_table_add_composite_primary_key_oracle">
@@ -925,7 +925,7 @@
     <alter-table sql-case-id="alter_table_add_constraints_sqlserver">
         <table name="t_order_item" start-index="12" stop-index="23" />
         <add-constraint>
-            <referenced-table stop-index="134" start-index="128" name="t_order"/>
+            <referenced-table stop-index="134" start-index="128" name="t_order" />
         </add-constraint>
     </alter-table>
     
@@ -952,23 +952,23 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_set_schema">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_attach_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_detach_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_in_hash_partitioned_table">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_optimize_memory_read">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="44" stop-index="59">
                 <column name="name" />
@@ -977,7 +977,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_no_optimize_memory_write">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="48" stop-index="63">
                 <column name="name" />
@@ -986,7 +986,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_enable_validate">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -995,7 +995,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_primary_key">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1004,7 +1004,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_index_clause">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1013,7 +1013,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_exception_clause">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1022,7 +1022,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_cascade">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1031,7 +1031,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_keep_index">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1040,7 +1040,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_enable_table_lock">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1049,7 +1049,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_enable_all_triggers">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1058,7 +1058,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_disable_container_map">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1067,7 +1067,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_with_disable_containers_default">
-        <table name="t_log" start-index="12" stop-index="16"/>
+        <table name="t_log" start-index="12" stop-index="16" />
         <add-column>
             <column-definition type="VARCHAR" start-index="23" stop-index="38">
                 <column name="name" />
@@ -1076,90 +1076,90 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_add_range_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_add_list_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_drop_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_drop_partition_update_global_index">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_drop_partition_update_all_index">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_drop_partition_update_all_index_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_drop_partition_update_all_index_subpartition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_drop_partition_update_global_index_parallel">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_drop_partition_update_all_index_noparallel">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_add_hash_partition1">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_add_hash_partition2">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_modify_hash_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_modify_list_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_modify_range_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_move_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_coalesce_partition">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_convert">
-        <table name="t1" start-index="12" stop-index="13"/>
+        <table name="t1" start-index="12" stop-index="13" />
         <convert-table start-index="15" stop-index="46">
             <charset name="DEFAULT" start-index="40" stop-index="46" />
         </convert-table>
     </alter-table>
     
     <alter-table sql-case-id="alter_table_convert_collate">
-        <table name="t1" start-index="12" stop-index="13"/>
+        <table name="t1" start-index="12" stop-index="13" />
         <convert-table start-index="15" stop-index="65">
             <charset name="DEFAULT" start-index="40" stop-index="46" />
             <collate-expression start-index="28" stop-index="45" literal-stop-index="64">
                 <collate-name>
-                    <literal-expression value="cp1251_bin" start-index="48" stop-index="65"/>
+                    <literal-expression value="cp1251_bin" start-index="48" stop-index="65" />
                 </collate-name>
             </collate-expression>
         </convert-table>
     </alter-table>
     
     <alter-table sql-case-id="alter_table_add_column_with_visible">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
         <add-column>
             <column-definition type="VARCHAR" start-index="31" stop-index="56">
                 <column name="status" />
@@ -1168,7 +1168,7 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_add_column_with_invisible">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
         <add-column>
             <column-definition type="VARCHAR" start-index="31" stop-index="58">
                 <column name="status" />
@@ -1203,26 +1203,26 @@
     </alter-table>
 
     <alter-table sql-case-id="alter_table_set_statistics">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_set_compression">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_set">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_reset">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_set_access_method">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 
     <alter-table sql-case-id="alter_table_drop_expression">
-        <table name="t_order" start-index="12" stop-index="18"/>
+        <table name="t_order" start-index="12" stop-index="18" />
     </alter-table>
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/ddl/alter-type.xml b/test/parser/src/main/resources/case/ddl/alter-type.xml
index 1b7625e01e8..0f687447fb1 100644
--- a/test/parser/src/main/resources/case/ddl/alter-type.xml
+++ b/test/parser/src/main/resources/case/ddl/alter-type.xml
@@ -20,7 +20,7 @@
     <alter-type sql-case-id="alter_type_owner" />
     <alter-type sql-case-id="alter_type_rename" />
     <alter-type sql-case-id="alter_type_set_schema" />
-    <alter-type sql-case-id="alter_type_add_attribute"/>
-    <alter-type sql-case-id="alter_type_add_value"/>
-    <alter-type sql-case-id="alter_type_rename_value"/>
+    <alter-type sql-case-id="alter_type_add_attribute" />
+    <alter-type sql-case-id="alter_type_add_value" />
+    <alter-type sql-case-id="alter_type_rename_value" />
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/ddl/cluster.xml b/test/parser/src/main/resources/case/ddl/cluster.xml
index 62f3f9de990..16354803af7 100644
--- a/test/parser/src/main/resources/case/ddl/cluster.xml
+++ b/test/parser/src/main/resources/case/ddl/cluster.xml
@@ -26,5 +26,5 @@
         <table name="clstr_1" start-index="8" stop-index="14" />
     </cluster>
 
-    <cluster sql-case-id="cluster"/>
+    <cluster sql-case-id="cluster" />
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/ddl/create-table.xml b/test/parser/src/main/resources/case/ddl/create-table.xml
index bd84c5e9c01..2620d352496 100644
--- a/test/parser/src/main/resources/case/ddl/create-table.xml
+++ b/test/parser/src/main/resources/case/ddl/create-table.xml
@@ -546,7 +546,7 @@
             <column name="column3" />
         </column-definition>
         <constraint-definition constraint-name="uk_order_id" index-name="order_id_index" start-index="132" stop-index="190">
-            <index-column name="order_id" start-index="182" stop-index="189"/>
+            <index-column name="order_id" start-index="182" stop-index="189" />
         </constraint-definition>
     </create-table>
     
@@ -653,7 +653,7 @@
         <column-definition type="VARCHAR" start-index="111" stop-index="129">
             <column name="column3" />
         </column-definition>
-        <constraint-definition start-index="132" stop-index="151"/>
+        <constraint-definition start-index="132" stop-index="151" />
     </create-table>
     
     <create-table sql-case-id="create_table_with_out_of_line_constraints">
@@ -683,12 +683,12 @@
             <primary-key-column name="item_id" start-index="163" stop-index="169" />
         </constraint-definition>
         <constraint-definition start-index="173" stop-index="188">
-            <index-column name="item_id" start-index="181" stop-index="187"/>
+            <index-column name="item_id" start-index="181" stop-index="187" />
         </constraint-definition>
         <constraint-definition start-index="191" stop-index="278">
             <referenced-table name="t_order" start-index="225" stop-index="231" />
         </constraint-definition>
-        <constraint-definition start-index="281" stop-index="299"/>
+        <constraint-definition start-index="281" stop-index="299" />
     </create-table>
     
     <create-table sql-case-id="create_table_with_out_of_line_index">
@@ -764,7 +764,7 @@
             <column name="column3" />
         </column-definition>
         <constraint-definition index-name="order_index" start-index="132" stop-index="171">
-            <index-column name="order_id" start-index="151" stop-index="158"/>
+            <index-column name="order_id" start-index="151" stop-index="158" />
         </constraint-definition>
     </create-table>
     
@@ -1064,7 +1064,7 @@
             <column name="column3" />
         </column-definition>
         <constraint-definition start-index="175" stop-index="195">
-            <primary-key-column name="item_id" start-index="188" stop-index="194"/>
+            <primary-key-column name="item_id" start-index="188" stop-index="194" />
         </constraint-definition>
         <constraint-definition start-index="198" stop-index="213">
             <index-column name="item_id" start-index="206" stop-index="212" />
@@ -1604,10 +1604,10 @@
         <table name="t_order_new" start-index="13" stop-index="23" />
         <select>
             <from>
-                <simple-table name="t_order" start-index="178" stop-index="184"/>
+                <simple-table name="t_order" start-index="178" stop-index="184" />
             </from>
             <projections start-index="171" stop-index="171">
-                <shorthand-projection start-index="171" stop-index="171"/>
+                <shorthand-projection start-index="171" stop-index="171" />
             </projections>
         </select>
     </create-table>
@@ -1618,18 +1618,18 @@
         <column name="user_id_new" start-index="40" stop-index="50" />
         <select>
             <from>
-                <simple-table name="t_order" start-index="222" stop-index="228"/>
+                <simple-table name="t_order" start-index="222" stop-index="228" />
             </from>
             <projections start-index="199" stop-index="215">
-                <column-projection name="order_id" start-index="199" stop-index="206"/>
-                <column-projection name="user_id" start-index="209" stop-index="215"/>
+                <column-projection name="order_id" start-index="199" stop-index="206" />
+                <column-projection name="user_id" start-index="209" stop-index="215" />
             </projections>
         </select>
     </create-table>
 
     <create-table sql-case-id="create_table_as_select_with_query_hint">
         <table name="t_order_new" start-index="13" stop-index="27" >
-            <owner name="dbo" start-index="13" stop-index="15"/>
+            <owner name="dbo" start-index="13" stop-index="15" />
         </table>
         <select>
             <from>
diff --git a/test/parser/src/main/resources/case/ddl/create-view.xml b/test/parser/src/main/resources/case/ddl/create-view.xml
index 85796961278..6dc89498c82 100644
--- a/test/parser/src/main/resources/case/ddl/create-view.xml
+++ b/test/parser/src/main/resources/case/ddl/create-view.xml
@@ -30,10 +30,10 @@
                 <expr>
                     <binary-operation-expression start-index="50" stop-index="64">
                         <left>
-                            <column name="kind" start-index="50" stop-index="53"/>
+                            <column name="kind" start-index="50" stop-index="53" />
                         </left>
                         <right>
-                            <literal-expression value="Comedy" start-index="57" stop-index="64"/>
+                            <literal-expression value="Comedy" start-index="57" stop-index="64" />
                         </right>
                         <operator>=</operator>
                     </binary-operation-expression>
@@ -55,10 +55,10 @@
                 <expr>
                     <binary-operation-expression start-index="63" stop-index="82">
                         <left>
-                            <column name="classification" start-index="63" stop-index="76"/>
+                            <column name="classification" start-index="63" stop-index="76" />
                         </left>
                         <right>
-                            <literal-expression value="U" start-index="80" stop-index="82"/>
+                            <literal-expression value="U" start-index="80" stop-index="82" />
                         </right>
                         <operator>=</operator>
                     </binary-operation-expression>
@@ -86,10 +86,10 @@
                         <expr>
                             <binary-operation-expression start-index="101" stop-index="107">
                                 <left>
-                                    <column name="n" start-index="101" stop-index="101"/>
+                                    <column name="n" start-index="101" stop-index="101" />
                                 </left>
                                 <right>
-                                    <literal-expression value="100" start-index="105" stop-index="107"/>
+                                    <literal-expression value="100" start-index="105" stop-index="107" />
                                 </right>
                                 <operator>=</operator>
                             </binary-operation-expression>
diff --git a/test/parser/src/main/resources/case/ddl/listen.xml b/test/parser/src/main/resources/case/ddl/listen.xml
index 8acb3e6bb6e..87a1753cd42 100644
--- a/test/parser/src/main/resources/case/ddl/listen.xml
+++ b/test/parser/src/main/resources/case/ddl/listen.xml
@@ -18,6 +18,6 @@
 
 <sql-parser-test-cases>
     <listen sql-case-id="listen" channel-name="foo_event" />
-    <listen sql-case-id="listen_notify" channel-name="notify_async2"/>
-    <listen sql-case-id="listen_low" channel-name="a"/>
+    <listen sql-case-id="listen_notify" channel-name="notify_async2" />
+    <listen sql-case-id="listen_low" channel-name="a" />
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/ddl/notify.xml b/test/parser/src/main/resources/case/ddl/notify.xml
index 77132f816e2..b61a0e9d0df 100644
--- a/test/parser/src/main/resources/case/ddl/notify.xml
+++ b/test/parser/src/main/resources/case/ddl/notify.xml
@@ -17,6 +17,6 @@
   -->
 
 <sql-parser-test-cases>
-    <notify sql-case-id="notify"/>
-    <notify sql-case-id="notify_low"/>
+    <notify sql-case-id="notify" />
+    <notify sql-case-id="notify_low" />
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dml/call.xml b/test/parser/src/main/resources/case/dml/call.xml
index f019004b9f6..0b4dac9cc10 100644
--- a/test/parser/src/main/resources/case/dml/call.xml
+++ b/test/parser/src/main/resources/case/dml/call.xml
@@ -19,128 +19,128 @@
 
 <sql-parser-test-cases>
     <call sql-case-id="call_without_parameters">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
     </call>
     
     <call sql-case-id="call_with_parameters_all_variable">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <common-expression literal-text="@order_id" start-index="7" stop-index="15"/>
+            <common-expression literal-text="@order_id" start-index="7" stop-index="15" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="@user_id" start-index="18" stop-index="25"/>
+            <common-expression literal-text="@user_id" start-index="18" stop-index="25" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_parameters_all_placeholder">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <parameter-marker-expression parameter-index="0" start-index="7" stop-index="7"/>
+            <parameter-marker-expression parameter-index="0" start-index="7" stop-index="7" />
         </procedure-parameter>
         <procedure-parameter>
-            <parameter-marker-expression parameter-index="1" start-index="10" stop-index="10"/>
+            <parameter-marker-expression parameter-index="1" start-index="10" stop-index="10" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_parameters_all_expression">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <literal-expression value="user" start-index="7" stop-index="12"/>
+            <literal-expression value="user" start-index="7" stop-index="12" />
         </procedure-parameter>
         <procedure-parameter>
-            <literal-expression value="order" start-index="15" stop-index="21"/>
+            <literal-expression value="order" start-index="15" stop-index="21" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_parameters_mix">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <common-expression literal-text="@order_id" start-index="7" stop-index="15"/>
+            <common-expression literal-text="@order_id" start-index="7" stop-index="15" />
         </procedure-parameter>
         <procedure-parameter>
-            <literal-expression value="user" start-index="18" stop-index="23"/>
+            <literal-expression value="user" start-index="18" stop-index="23" />
         </procedure-parameter>
         <procedure-parameter>
-            <parameter-marker-expression parameter-index="0" start-index="26" stop-index="26"/>
+            <parameter-marker-expression parameter-index="0" start-index="26" stop-index="26" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_named_notation_with_null">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <common-expression literal-text="a => null" start-index="7" stop-index="15"/>
+            <common-expression literal-text="a => null" start-index="7" stop-index="15" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="b => 8" start-index="18" stop-index="23"/>
+            <common-expression literal-text="b => 8" start-index="18" stop-index="23" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="c => 2" start-index="26" stop-index="31"/>
+            <common-expression literal-text="c => 2" start-index="26" stop-index="31" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_named_notation">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <common-expression literal-text="b => 8" start-index="7" stop-index="12"/>
+            <common-expression literal-text="b => 8" start-index="7" stop-index="12" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="c => 2" start-index="15" stop-index="20"/>
+            <common-expression literal-text="c => 2" start-index="15" stop-index="20" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="a => 0" start-index="23" stop-index="28"/>
+            <common-expression literal-text="a => 0" start-index="23" stop-index="28" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_mixed_notation">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <common-expression literal-text="null" start-index="7" stop-index="10"/>
+            <common-expression literal-text="null" start-index="7" stop-index="10" />
         </procedure-parameter>
         <procedure-parameter>
-            <literal-expression value="7" start-index="13" stop-index="13"/>
+            <literal-expression value="7" start-index="13" stop-index="13" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="c => 2" start-index="16" stop-index="21"/>
+            <common-expression literal-text="c => 2" start-index="16" stop-index="21" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_mixed_notation_with_null">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <common-expression literal-text="null" start-index="7" stop-index="10"/>
+            <common-expression literal-text="null" start-index="7" stop-index="10" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="c => 4" start-index="13" stop-index="18"/>
+            <common-expression literal-text="c => 4" start-index="13" stop-index="18" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="b => 11" start-index="21" stop-index="27"/>
+            <common-expression literal-text="b => 11" start-index="21" stop-index="27" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_mixed_notation_with_apos">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <literal-expression value="10" start-index="7" stop-index="8"/>
+            <literal-expression value="10" start-index="7" stop-index="8" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="b => 'Hello'" start-index="11" stop-index="22"/>
+            <common-expression literal-text="b => 'Hello'" start-index="11" stop-index="22" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_named_notation_with_apos">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <common-expression literal-text="b => 'Hello'" start-index="7" stop-index="18"/>
+            <common-expression literal-text="b => 'Hello'" start-index="7" stop-index="18" />
         </procedure-parameter>
         <procedure-parameter>
-            <common-expression literal-text="a => 10" start-index="21" stop-index="27"/>
+            <common-expression literal-text="a => 10" start-index="21" stop-index="27" />
         </procedure-parameter>
     </call>
     
     <call sql-case-id="call_with_positional_notation_with_expression">
-        <procedure-name name="p" start-index="5" stop-index="6"/>
+        <procedure-name name="p" start-index="5" stop-index="6" />
         <procedure-parameter>
-            <common-expression literal-text="1.0/0.1" start-index="7" stop-index="13"/>
+            <common-expression literal-text="1.0/0.1" start-index="7" stop-index="13" />
         </procedure-parameter>
     </call>
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dml/delete.xml b/test/parser/src/main/resources/case/dml/delete.xml
index 2248f1a89f9..7b8a610d275 100644
--- a/test/parser/src/main/resources/case/dml/delete.xml
+++ b/test/parser/src/main/resources/case/dml/delete.xml
@@ -129,17 +129,17 @@
                 <in-expression start-index="38" stop-index="211">
                     <not>false</not>
                     <left>
-                        <common-expression text="(product_id,currency_code,effective_from_date)" start-index="38" stop-index="85"/>
+                        <common-expression text="(product_id,currency_code,effective_from_date)" start-index="38" stop-index="85" />
                     </left>
                     <right>
                         <subquery start-index="90" stop-index="211">
                             <select>
                                 <from start-index="155" stop-index="175">
-                                    <simple-table name="product_price_history" start-index="155" stop-index="175"/>
+                                    <simple-table name="product_price_history" start-index="155" stop-index="175" />
                                 </from>
                                 <projections start-index="98" stop-index="148">
-                                    <column-projection name="product_id" start-index="98" stop-index="107"/>
-                                    <column-projection name="currency_code" start-index="110" stop-index="122"/>
+                                    <column-projection name="product_id" start-index="98" stop-index="107" />
+                                    <column-projection name="currency_code" start-index="110" stop-index="122" />
                                     <aggregation-projection type="MAX" inner-expression="(effective_from_date)" start-index="125" stop-index="148" />
                                 </projections>
                                 <group-by>
@@ -217,16 +217,16 @@
         <output start-index="20" stop-index="106">
             <output-columns start-index="27" stop-index="59">
                 <column-projection name="order_id" start-index="27" stop-index="42">
-                    <owner name="DELETED" start-index="27" stop-index="33"/>
+                    <owner name="DELETED" start-index="27" stop-index="33" />
                 </column-projection>
                 <column-projection name="user_id" start-index="45" stop-index="59">
-                    <owner name="DELETED" start-index="45" stop-index="51"/>
+                    <owner name="DELETED" start-index="45" stop-index="51" />
                 </column-projection>
             </output-columns>
-            <output-table name="@MyTableVar" start-index="66" stop-index="76"/>
+            <output-table name="@MyTableVar" start-index="66" stop-index="76" />
             <output-table-columns start-index="78" stop-index="106">
-                <column name="temp_order_id" start-index="79" stop-index="91"/>
-                <column name="temp_user_id" start-index="94" stop-index="105"/>
+                <column name="temp_order_id" start-index="79" stop-index="91" />
+                <column name="temp_user_id" start-index="94" stop-index="105" />
             </output-table-columns>
         </output>
         <where start-index="108" stop-index="125" literal-stop-index="128">
@@ -250,13 +250,13 @@
         <output start-index="20" stop-index="76">
             <output-columns start-index="27" stop-index="59">
                 <column-projection name="order_id" start-index="27" stop-index="42">
-                    <owner name="DELETED" start-index="27" stop-index="33"/>
+                    <owner name="DELETED" start-index="27" stop-index="33" />
                 </column-projection>
                 <column-projection name="user_id" start-index="45" stop-index="59">
-                    <owner name="DELETED" start-index="45" stop-index="51"/>
+                    <owner name="DELETED" start-index="45" stop-index="51" />
                 </column-projection>
             </output-columns>
-            <output-table name="@MyTableVar" start-index="66" stop-index="76"/>
+            <output-table name="@MyTableVar" start-index="66" stop-index="76" />
         </output>
         <where start-index="78" stop-index="95" literal-stop-index="98">
             <expr>
@@ -279,10 +279,10 @@
         <output start-index="20" stop-index="59">
             <output-columns start-index="27" stop-index="59">
                 <column-projection name="order_id" start-index="27" stop-index="42">
-                    <owner name="DELETED" start-index="27" stop-index="33"/>
+                    <owner name="DELETED" start-index="27" stop-index="33" />
                 </column-projection>
                 <column-projection name="user_id" start-index="45" stop-index="59">
-                    <owner name="DELETED" start-index="45" stop-index="51"/>
+                    <owner name="DELETED" start-index="45" stop-index="51" />
                 </column-projection>
             </output-columns>
         </output>
@@ -304,7 +304,7 @@
 
     <delete sql-case-id="delete_with_output_clause_column_shorthand" parameters="1000">
         <table name="t_order" start-index="12" stop-index="18" />
-        <output start-index="20" stop-index="35"/>
+        <output start-index="20" stop-index="35" />
         <where start-index="37" stop-index="54" literal-stop-index="57">
             <expr>
                 <binary-operation-expression start-index="43" stop-index="54" literal-stop-index="57">
@@ -360,8 +360,8 @@
     <delete sql-case-id="delete_with_with_clause">
         <with start-index="0" stop-index="70">
             <common-table-expression name = "cte" start-index="5" stop-index="70">
-                <column name="order_id" start-index="10" stop-index="17"/>
-                <column name="user_id" start-index="20" stop-index="26"/>
+                <column name="order_id" start-index="10" stop-index="17" />
+                <column name="user_id" start-index="20" stop-index="26" />
                 <subquery-expression start-index="33" stop-index="69">
                     <select>
                         <from>
@@ -468,8 +468,8 @@
                 </binary-operation-expression>
             </expr>
         </where>
-        <table name="t_order" start-index="7" stop-index="13"/>
-        <table name="t_order_item" start-index="16" stop-index="27"/>
+        <table name="t_order" start-index="7" stop-index="13" />
+        <table name="t_order_item" start-index="16" stop-index="27" />
     </delete>
 
     <delete sql-case-id="delete_multi_tables_with_using" parameters="1">
@@ -489,8 +489,8 @@
                 </binary-operation-expression>
             </expr>
         </where>
-        <table name="t_order" start-index="12" stop-index="18"/>
-        <table name="t_order_item" start-index="21" stop-index="32"/>
+        <table name="t_order" start-index="12" stop-index="18" />
+        <table name="t_order_item" start-index="21" stop-index="32" />
     </delete>
 
     <delete sql-case-id="delete_with_query_hint" parameters="1000">
@@ -533,10 +533,10 @@
             <subquery>
                 <select>
                     <from start-index="27" stop-index="35">
-                        <simple-table name="employees" start-index="27" stop-index="35"/>
+                        <simple-table name="employees" start-index="27" stop-index="35" />
                     </from>
                     <projections start-index="20" stop-index="20">
-                        <shorthand-projection start-index="20" stop-index="20"/>
+                        <shorthand-projection start-index="20" stop-index="20" />
                     </projections>
                 </select>
             </subquery>
@@ -547,11 +547,11 @@
                     <left>
                         <binary-operation-expression start-index="44" stop-index="60">
                             <left>
-                                <column name="job_id" start-index="44" stop-index="49"/>
+                                <column name="job_id" start-index="44" stop-index="49" />
                             </left>
                             <operator>=</operator>
                             <right>
-                                <literal-expression value="SA_REP" start-index="53" stop-index="60"/>
+                                <literal-expression value="SA_REP" start-index="53" stop-index="60" />
                             </right>
                         </binary-operation-expression>
                     </left>
@@ -559,11 +559,11 @@
                     <right>
                         <binary-operation-expression start-index="66" stop-index="85">
                             <left>
-                                <column name="commission_pct" start-index="66" stop-index="79"/>
+                                <column name="commission_pct" start-index="66" stop-index="79" />
                             </left>
                             <operator>&lt;</operator>
                             <right>
-                                <literal-expression value="0.2" start-index="83" stop-index="85"/>
+                                <literal-expression value="0.2" start-index="83" stop-index="85" />
                             </right>
                         </binary-operation-expression>
                     </right>
@@ -577,10 +577,10 @@
             <subquery>
                 <select>
                     <from start-index="27" stop-index="35">
-                        <simple-table name="product_price_history" start-index="22" stop-index="42"/>
+                        <simple-table name="product_price_history" start-index="22" stop-index="42" />
                     </from>
                     <projections start-index="15" stop-index="15">
-                        <shorthand-projection start-index="15" stop-index="15"/>
+                        <shorthand-projection start-index="15" stop-index="15" />
                     </projections>
                 </select>
             </subquery>
@@ -589,11 +589,11 @@
             <expr>
                 <binary-operation-expression start-index="51" stop-index="71">
                     <left>
-                        <column name="currency_code" start-index="51" stop-index="63"/>
+                        <column name="currency_code" start-index="51" stop-index="63" />
                     </left>
                     <operator>=</operator>
                     <right>
-                        <literal-expression value="EUR" start-index="67" stop-index="71"/>
+                        <literal-expression value="EUR" start-index="67" stop-index="71" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -627,11 +627,11 @@
                     <left>
                         <binary-operation-expression start-index="28" stop-index="44">
                             <left>
-                                <column name="job_id" start-index="28" stop-index="33"/>
+                                <column name="job_id" start-index="28" stop-index="33" />
                             </left>
                             <operator>=</operator>
                             <right>
-                                <literal-expression value="SA_REP" start-index="37" stop-index="44"/>
+                                <literal-expression value="SA_REP" start-index="37" stop-index="44" />
                             </right>
                         </binary-operation-expression>
                     </left>
@@ -641,13 +641,13 @@
                             <left>
                                 <binary-operation-expression start-index="50" stop-index="83">
                                     <left>
-                                        <column name="hire_date" start-index="50" stop-index="58"/>
+                                        <column name="hire_date" start-index="50" stop-index="58" />
                                     </left>
                                     <operator>+</operator>
                                     <right>
                                         <function function-name="TO_YMINTERVAL" text="TO_YMINTERVAL('01-00')" start-index="62" stop-index="83">
                                             <parameter>
-                                                <literal-expression value="01-00" start-index="76" stop-index="82"/>
+                                                <literal-expression value="01-00" start-index="76" stop-index="82" />
                                             </parameter>
                                         </function>
                                     </right>
@@ -655,7 +655,7 @@
                             </left>
                             <operator>&lt;</operator>
                             <right>
-                                <column name="SYSDATE" start-index="87" stop-index="93"/>
+                                <column name="SYSDATE" start-index="87" stop-index="93" />
                             </right>
                         </binary-operation-expression>
                     </right>
diff --git a/test/parser/src/main/resources/case/dml/do.xml b/test/parser/src/main/resources/case/dml/do.xml
index c9fb850c95f..674e93246bf 100644
--- a/test/parser/src/main/resources/case/dml/do.xml
+++ b/test/parser/src/main/resources/case/dml/do.xml
@@ -19,46 +19,46 @@
 <sql-parser-test-cases>
     <do sql-case-id="do_constant">
         <parameter>
-            <literal-expression value="1" start-index="3" stop-index="3"/>
+            <literal-expression value="1" start-index="3" stop-index="3" />
         </parameter>
     </do>
     
     <do sql-case-id="do_sleep">
         <parameter>
-            <literal-expression value="SLEEP(1)" start-index="3" stop-index="10"/>
+            <literal-expression value="SLEEP(1)" start-index="3" stop-index="10" />
         </parameter>
     </do>
     
     <do sql-case-id="do_multiple_sleep">
         <parameter>
-            <literal-expression value="SLEEP(1)" start-index="3" stop-index="10"/>
+            <literal-expression value="SLEEP(1)" start-index="3" stop-index="10" />
         </parameter>
         <parameter>
-            <literal-expression value="SLEEP(2)" start-index="13" stop-index="20"/>
+            <literal-expression value="SLEEP(2)" start-index="13" stop-index="20" />
         </parameter>
     </do>
     
     <do sql-case-id="do_with_function_1">
         <parameter>
-            <literal-expression value="FROM_BASE64(CAST((MID(UUID(),20,64)) AS BINARY(55)))" start-index="3" stop-index="54"/>
+            <literal-expression value="FROM_BASE64(CAST((MID(UUID(),20,64)) AS BINARY(55)))" start-index="3" stop-index="54" />
         </parameter>
     </do>
     
     <do sql-case-id="do_with_function_2">
         <parameter>
-            <literal-expression value="FROM_BASE64(CAST(RIGHT(11,1)AS BINARY(24)))" start-index="3" stop-index="45"/>
+            <literal-expression value="FROM_BASE64(CAST(RIGHT(11,1)AS BINARY(24)))" start-index="3" stop-index="45" />
         </parameter>
     </do>
     
     <do sql-case-id="do_with_function_3">
         <parameter>
-            <literal-expression value="COUNT(DISTINCT ROUND(CAST(SLEEP(0) AS DECIMAL), NULL))" start-index="3" stop-index="56"/>
+            <literal-expression value="COUNT(DISTINCT ROUND(CAST(SLEEP(0) AS DECIMAL), NULL))" start-index="3" stop-index="56" />
         </parameter>
     </do>
     
     <do sql-case-id="do_with_crc32_function">
         <parameter>
-            <literal-expression value="CRC32(CHAR(1.134475E+308))" start-index="3" stop-index="28"/>
+            <literal-expression value="CRC32(CHAR(1.134475E+308))" start-index="3" stop-index="28" />
         </parameter>
     </do>
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dml/insert.xml b/test/parser/src/main/resources/case/dml/insert.xml
index 5f916d0a40e..6e2a2acfd01 100644
--- a/test/parser/src/main/resources/case/dml/insert.xml
+++ b/test/parser/src/main/resources/case/dml/insert.xml
@@ -109,11 +109,11 @@
         <values>
             <value>
                 <assignment-value>
-                    <parameter-marker-expression parameter-index="0" start-index="38" stop-index="38"/>
+                    <parameter-marker-expression parameter-index="0" start-index="38" stop-index="38" />
                     <literal-expression value="1" start-index="38" stop-index="38" />
                 </assignment-value>
                 <assignment-value>
-                    <parameter-marker-expression parameter-index="1" start-index="41" stop-index="41"/>
+                    <parameter-marker-expression parameter-index="1" start-index="41" stop-index="41" />
                     <literal-expression value="1" start-index="41" stop-index="41" />
                 </assignment-value>
             </value>
@@ -198,17 +198,17 @@
                 </assignment-value>
             </value>
         </values>
-        <comment start-index="7" stop-index="26" text="/*+ index(field1) */"/>
+        <comment start-index="7" stop-index="26" text="/*+ index(field1) */" />
         <returning>
             <projections start-index="103" stop-index="169">
                 <column-projection name="order_id" start-index="103" stop-index="110" />
                 <shorthand-projection start-index="113" stop-index="113" />
                 <shorthand-projection start-index="116" stop-index="124">
-                    <owner name="t_order" start-index="116" stop-index="122"/>
+                    <owner name="t_order" start-index="116" stop-index="122" />
                 </shorthand-projection>
                 <column-projection name="user_id" alias="u" start-index="127" stop-index="135" />
                 <column-projection name="status" alias="s" start-index="138" stop-index="156">
-                    <owner name="t_order" start-index="138" stop-index="144"/>
+                    <owner name="t_order" start-index="138" stop-index="144" />
                 </column-projection>
                 <expression-projection text="'OK'" alias="result" start-index="159" stop-index="169" />
             </projections>
@@ -274,7 +274,7 @@
                 <column name="order_id" start-index="24" stop-index="31" />
                 <assignment-value>
                     <parameter-marker-expression parameter-index="0" start-index="35" stop-index="35" />
-                    <literal-expression value="1" literal-start-index="35" literal-stop-index="35"/>
+                    <literal-expression value="1" literal-start-index="35" literal-stop-index="35" />
                 </assignment-value>
             </assignment>
             <assignment>
@@ -371,7 +371,7 @@
                     <literal-expression value="insert" start-index="93" stop-index="100" literal-start-index="101" literal-stop-index="108" />
                 </assignment-value>
                 <assignment-value>
-                    <literal-expression value="2017-08-08" start-index="103" stop-index="114" literal-start-index="111" literal-stop-index="122"/>
+                    <literal-expression value="2017-08-08" start-index="103" stop-index="114" literal-start-index="111" literal-stop-index="122" />
                 </assignment-value>
             </value>
         </values>
@@ -470,7 +470,7 @@
             <assignment>
                 <column name="creation_date" start-index="75" stop-index="87" literal-start-index="79" literal-stop-index="91" />
                 <assignment-value>
-                    <literal-expression value="2017-08-08" start-index="89" stop-index="100" literal-start-index="93" literal-stop-index="104"/>
+                    <literal-expression value="2017-08-08" start-index="89" stop-index="100" literal-start-index="93" literal-stop-index="104" />
                 </assignment-value>
             </assignment>
         </set>
@@ -505,7 +505,7 @@
                 <assignment-value>
                     <function function-name="VALUES" text="VALUES(status)" start-index="98" stop-index="111" literal-start-index="103" literal-stop-index="116">
                         <parameter>
-                            <column name="status" start-index="105" stop-index="110" literal-start-index="110" literal-stop-index="115"/>
+                            <column name="status" start-index="105" stop-index="110" literal-start-index="110" literal-stop-index="115" />
                         </parameter>
                     </function>
                 </assignment-value>
@@ -818,7 +818,7 @@
                     <literal-expression value="10" start-index="140" stop-index="141" />
                 </assignment-value>
                 <assignment-value>
-                    <literal-expression value="insert" start-index="128" stop-index="135" literal-start-index="144" literal-stop-index="151"/>
+                    <literal-expression value="insert" start-index="128" stop-index="135" literal-start-index="144" literal-stop-index="151" />
                 </assignment-value>
                 <assignment-value>
                     <literal-expression value="2017-08-08" start-index="138" stop-index="149" literal-start-index="154" literal-stop-index="165" />
@@ -912,7 +912,7 @@
             <value>
                 <assignment-value>
                     <parameter-marker-expression parameter-index="0" start-index="32" stop-index="32" />
-                    <literal-expression value="10000" literal-start-index="32" literal-stop-index="36"/>
+                    <literal-expression value="10000" literal-start-index="32" literal-stop-index="36" />
                 </assignment-value>
                 <assignment-value>
                     <parameter-marker-expression parameter-index="1" start-index="35" stop-index="35" />
@@ -994,7 +994,7 @@
         <values>
             <value>
                 <assignment-value>
-                    <common-expression text="null" start-index="43" stop-index="46"/>
+                    <common-expression text="null" start-index="43" stop-index="46" />
                 </assignment-value>
             </value>
         </values>
@@ -1185,7 +1185,7 @@
             <assignment start-index="51" stop-index="111" literal-stop-index="116">
                 <column name="status" start-index="51" stop-index="56" />
                 <assignment-value>
-                    <function function-name="convert" text="convert(to_base64(aes_encrypt(?, 'key')) USING utf8)" literal-text="convert(to_base64(aes_encrypt('init', 'key')) USING utf8)" start-index="60" stop-index="111" literal-start-index="60" literal-stop-index="116"/>
+                    <function function-name="convert" text="convert(to_base64(aes_encrypt(?, 'key')) USING utf8)" literal-text="convert(to_base64(aes_encrypt('init', 'key')) USING utf8)" start-index="60" stop-index="111" literal-start-index="60" literal-stop-index="116" />
                 </assignment-value>
             </assignment>
         </set>
@@ -1231,11 +1231,11 @@
                 </values>
             </table-element>
             <table-element>
-                <table name="t_order" start-index="74" stop-index="80" literal-start-index="79" literal-stop-index="85"/>
+                <table name="t_order" start-index="74" stop-index="80" literal-start-index="79" literal-stop-index="85" />
                 <columns start-index="82" stop-index="108" literal-start-index="87" literal-stop-index="113">
-                    <column name="order_id" start-index="83" stop-index="90" literal-start-index="88" literal-stop-index="95"/>
-                    <column name="user_id" start-index="93" stop-index="99" literal-start-index="98" literal-stop-index="104"/>
-                    <column name="status" start-index="102" stop-index="107" literal-start-index="107" literal-stop-index="112"/>
+                    <column name="order_id" start-index="83" stop-index="90" literal-start-index="88" literal-stop-index="95" />
+                    <column name="user_id" start-index="93" stop-index="99" literal-start-index="98" literal-stop-index="104" />
+                    <column name="status" start-index="102" stop-index="107" literal-start-index="107" literal-stop-index="112" />
                 </columns>
                 <values>
                     <value>
@@ -1255,11 +1255,11 @@
                 </values>
             </table-element>
             <table-element>
-                <table name="t_order" start-index="132" stop-index="138" literal-start-index="142" literal-stop-index="148"/>
+                <table name="t_order" start-index="132" stop-index="138" literal-start-index="142" literal-stop-index="148" />
                 <columns start-index="140" stop-index="166" literal-start-index="150" literal-stop-index="176">
-                    <column name="order_id" start-index="141" stop-index="148" literal-start-index="151" literal-stop-index="158"/>
-                    <column name="user_id" start-index="151" stop-index="157" literal-start-index="161" literal-stop-index="167"/>
-                    <column name="status" start-index="160" stop-index="165" literal-start-index="170" literal-stop-index="175"/>
+                    <column name="order_id" start-index="141" stop-index="148" literal-start-index="151" literal-stop-index="158" />
+                    <column name="user_id" start-index="151" stop-index="157" literal-start-index="161" literal-stop-index="167" />
+                    <column name="status" start-index="160" stop-index="165" literal-start-index="170" literal-stop-index="175" />
                 </columns>
                 <values>
                     <value>
@@ -1281,10 +1281,10 @@
         </multi-table-element>
         <select-subquery>
             <from>
-                <simple-table name="dual" start-index="199" stop-index="202" literal-start-index="214" literal-stop-index="217"/>
+                <simple-table name="dual" start-index="199" stop-index="202" literal-start-index="214" literal-stop-index="217" />
             </from>
             <projections start-index="192" stop-index="192" literal-start-index="207" literal-stop-index="207">
-                <shorthand-projection start-index="192" stop-index="192" literal-start-index="207" literal-stop-index="207"/>
+                <shorthand-projection start-index="192" stop-index="192" literal-start-index="207" literal-stop-index="207" />
             </projections>
         </select-subquery>
     </insert>
@@ -1536,8 +1536,8 @@
     <insert sql-case-id="insert_with_with_clause">
         <with start-index="0" stop-index="70">
             <common-table-expression name = "cte" start-index="5" stop-index="70">
-                <column name="order_id" start-index="10" stop-index="17"/>
-                <column name="user_id" start-index="20" stop-index="26"/>
+                <column name="order_id" start-index="10" stop-index="17" />
+                <column name="user_id" start-index="20" stop-index="26" />
                 <subquery-expression start-index="33" stop-index="69">
                     <select>
                         <from>
@@ -1553,8 +1553,8 @@
         </with>
         <table name="t_order" start-index="84" stop-index="90" />
         <columns start-index="92" stop-index="110">
-            <column name="order_id" start-index="93" stop-index="100"/>
-            <column name="user_id" start-index="103" stop-index="109"/>
+            <column name="order_id" start-index="93" stop-index="100" />
+            <column name="user_id" start-index="103" stop-index="109" />
         </columns>
         <select>
             <from>
@@ -1585,8 +1585,8 @@
         </with>
         <table name="t_order" start-index="64" stop-index="70" />
         <columns start-index="72" stop-index="90">
-            <column name="order_id" start-index="73" stop-index="80"/>
-            <column name="user_id" start-index="83" stop-index="89"/>
+            <column name="order_id" start-index="73" stop-index="80" />
+            <column name="user_id" start-index="83" stop-index="89" />
         </columns>
         <select>
             <from>
@@ -1681,16 +1681,16 @@
         <output start-index="40" stop-index="128">
             <output-columns start-index="47" stop-index="81">
                 <column-projection name="order_id" start-index="47" stop-index="63">
-                    <owner name="INSERTED" start-index="47" stop-index="54"/>
+                    <owner name="INSERTED" start-index="47" stop-index="54" />
                 </column-projection>
                 <column-projection name="user_id" start-index="66" stop-index="81">
-                    <owner name="INSERTED" start-index="66" stop-index="73"/>
+                    <owner name="INSERTED" start-index="66" stop-index="73" />
                 </column-projection>
             </output-columns>
-            <output-table name="@MyTableVar" start-index="88" stop-index="98"/>
+            <output-table name="@MyTableVar" start-index="88" stop-index="98" />
             <output-table-columns start-index="100" stop-index="128">
-                <column name="temp_order_id" start-index="101" stop-index="113"/>
-                <column name="temp_user_id" start-index="116" stop-index="127"/>
+                <column name="temp_order_id" start-index="101" stop-index="113" />
+                <column name="temp_user_id" start-index="116" stop-index="127" />
             </output-table-columns>
         </output>
         <values>
@@ -1716,13 +1716,13 @@
         <output start-index="40" stop-index="98">
             <output-columns start-index="47" stop-index="81">
                 <column-projection name="order_id" start-index="47" stop-index="63">
-                    <owner name="INSERTED" start-index="47" stop-index="54"/>
+                    <owner name="INSERTED" start-index="47" stop-index="54" />
                 </column-projection>
                 <column-projection name="user_id" start-index="66" stop-index="81">
-                    <owner name="INSERTED" start-index="66" stop-index="73"/>
+                    <owner name="INSERTED" start-index="66" stop-index="73" />
                 </column-projection>
             </output-columns>
-            <output-table name="@MyTableVar" start-index="88" stop-index="98"/>
+            <output-table name="@MyTableVar" start-index="88" stop-index="98" />
         </output>
         <values>
             <value>
@@ -1747,10 +1747,10 @@
         <output start-index="40" stop-index="81">
             <output-columns start-index="47" stop-index="81">
                 <column-projection name="order_id" start-index="47" stop-index="63">
-                    <owner name="INSERTED" start-index="47" stop-index="54"/>
+                    <owner name="INSERTED" start-index="47" stop-index="54" />
                 </column-projection>
                 <column-projection name="user_id" start-index="66" stop-index="81">
-                    <owner name="INSERTED" start-index="66" stop-index="73"/>
+                    <owner name="INSERTED" start-index="66" stop-index="73" />
                 </column-projection>
             </output-columns>
         </output>
@@ -1774,7 +1774,7 @@
             <column name="order_id" start-index="21" stop-index="28" />
             <column name="user_id" start-index="31" stop-index="37" />
         </columns>
-        <output start-index="40" stop-index="56"/>
+        <output start-index="40" stop-index="56" />
         <values>
             <value>
                 <assignment-value>
diff --git a/test/parser/src/main/resources/case/dml/merge.xml b/test/parser/src/main/resources/case/dml/merge.xml
index 10f8f4d7c08..cc6acd52303 100644
--- a/test/parser/src/main/resources/case/dml/merge.xml
+++ b/test/parser/src/main/resources/case/dml/merge.xml
@@ -61,7 +61,7 @@
                             <expr>
                                 <binary-operation-expression start-index="91" stop-index="108">
                                     <left>
-                                        <column name="department_id" start-index="91" stop-index="103"/>
+                                        <column name="department_id" start-index="91" stop-index="103" />
                                     </left>
                                     <operator>=</operator>
                                     <right>
@@ -167,7 +167,7 @@
                             <expr>
                                 <binary-operation-expression start-index="91" stop-index="108">
                                     <left>
-                                        <column name="department_id" start-index="91" stop-index="103"/>
+                                        <column name="department_id" start-index="91" stop-index="103" />
                                     </left>
                                     <operator>=</operator>
                                     <right>
diff --git a/test/parser/src/main/resources/case/dml/replace.xml b/test/parser/src/main/resources/case/dml/replace.xml
index 9321fe0acf6..6a919bf881b 100644
--- a/test/parser/src/main/resources/case/dml/replace.xml
+++ b/test/parser/src/main/resources/case/dml/replace.xml
@@ -214,7 +214,7 @@
                 <column name="order_id" start-index="25" stop-index="32" />
                 <assignment-value>
                     <parameter-marker-expression parameter-index="0" start-index="36" stop-index="36" />
-                    <literal-expression value="1" literal-start-index="36" literal-stop-index="36"/>
+                    <literal-expression value="1" literal-start-index="36" literal-stop-index="36" />
                 </assignment-value>
             </assignment>
             <assignment>
@@ -311,7 +311,7 @@
                     <literal-expression value="replace" start-index="94" stop-index="102" literal-start-index="102" literal-stop-index="110" />
                 </assignment-value>
                 <assignment-value>
-                    <literal-expression value="2017-08-08" start-index="105" stop-index="116" literal-start-index="113" literal-stop-index="124"/>
+                    <literal-expression value="2017-08-08" start-index="105" stop-index="116" literal-start-index="113" literal-stop-index="124" />
                 </assignment-value>
             </value>
         </values>
@@ -410,7 +410,7 @@
             <assignment>
                 <column name="creation_date" start-index="77" stop-index="89" literal-start-index="81" literal-stop-index="93" />
                 <assignment-value>
-                    <literal-expression value="2017-08-08" start-index="91" stop-index="102" literal-start-index="95" literal-stop-index="106"/>
+                    <literal-expression value="2017-08-08" start-index="91" stop-index="102" literal-start-index="95" literal-stop-index="106" />
                 </assignment-value>
             </assignment>
         </set>
@@ -573,7 +573,7 @@
                     <literal-expression value="10" start-index="142" stop-index="143" />
                 </assignment-value>
                 <assignment-value>
-                    <literal-expression value="replace" start-index="130" stop-index="138" literal-start-index="146" literal-stop-index="154"/>
+                    <literal-expression value="replace" start-index="130" stop-index="138" literal-start-index="146" literal-stop-index="154" />
                 </assignment-value>
                 <assignment-value>
                     <literal-expression value="2017-08-08" start-index="141" stop-index="152" literal-start-index="157" literal-stop-index="168" />
@@ -633,7 +633,7 @@
             <value>
                 <assignment-value>
                     <parameter-marker-expression parameter-index="0" start-index="33" stop-index="33" />
-                    <literal-expression value="10000" literal-start-index="33" literal-stop-index="37"/>
+                    <literal-expression value="10000" literal-start-index="33" literal-stop-index="37" />
                 </assignment-value>
                 <assignment-value>
                     <parameter-marker-expression parameter-index="1" start-index="36" stop-index="36" />
@@ -729,7 +729,7 @@
         <values>
             <value>
                 <assignment-value>
-                    <common-expression text="_BINARY'This is a binary value.'" start-index="44" stop-index="75"/>
+                    <common-expression text="_BINARY'This is a binary value.'" start-index="44" stop-index="75" />
                 </assignment-value>
             </value>
         </values>
@@ -837,7 +837,7 @@
                             <function function-name="now" text="now()" start-index="71" stop-index="75" />
                         </parameter>
                         <parameter>
-                            <expression-projection text="interval ? second" literal-text="interval 1 second" start-index="77" stop-index="93"/>
+                            <expression-projection text="interval ? second" literal-text="interval 1 second" start-index="77" stop-index="93" />
                         </parameter>
                     </function>
                 </assignment-value>
diff --git a/test/parser/src/main/resources/case/dml/select-aggregate.xml b/test/parser/src/main/resources/case/dml/select-aggregate.xml
index cffb272fbb6..d007a2db415 100644
--- a/test/parser/src/main/resources/case/dml/select-aggregate.xml
+++ b/test/parser/src/main/resources/case/dml/select-aggregate.xml
@@ -34,7 +34,7 @@
             <aggregation-projection type="SUM" inner-expression="(t_order.user_id)" alias="user_id_sum" start-index="7" stop-index="26">
                 <paramters>
                     <column name="user_id" start-index="17" stop-index="25">
-                        <owner name="t_order" start-index="8" stop-index="16"/>
+                        <owner name="t_order" start-index="8" stop-index="16" />
                     </column>
                 </paramters>
             </aggregation-projection>
diff --git a/test/parser/src/main/resources/case/dml/select-expression.xml b/test/parser/src/main/resources/case/dml/select-expression.xml
index c0bc3d2abbc..9a4663f358a 100644
--- a/test/parser/src/main/resources/case/dml/select-expression.xml
+++ b/test/parser/src/main/resources/case/dml/select-expression.xml
@@ -19,37 +19,37 @@
 <sql-parser-test-cases>
     <select sql-case-id="select_with_expression">
         <from>
-            <simple-table name="t_order" alias="o" start-index="38" stop-index="49"/>
+            <simple-table name="t_order" alias="o" start-index="38" stop-index="49" />
         </from>
         <projections start-index="7" stop-index="31">
             <!-- TODO check expression-projection's stop-index whether include alias -->
-            <expression-projection text="o.order_id + 1 * 2" alias="exp" start-index="7" stop-index="31"/>
+            <expression-projection text="o.order_id + 1 * 2" alias="exp" start-index="7" stop-index="31" />
         </projections>
         <order-by>
             <column-item name="order_id" start-index="60" stop-index="69">
-                <owner name="o" start-index="60" stop-index="60"/>
+                <owner name="o" start-index="60" stop-index="60" />
             </column-item>
         </order-by>
     </select>
 
     <select sql-case-id="select_with_expression_for_postgresql">
         <from>
-            <simple-table name="t_order" alias="o" start-index="38" stop-index="49"/>
+            <simple-table name="t_order" alias="o" start-index="38" stop-index="49" />
         </from>
         <projections start-index="7" stop-index="31">
             <!-- 'text' is different from other database -->
-            <expression-projection text="o.order_id + 1 * 2" alias="exp" start-index="7" stop-index="31"/>
+            <expression-projection text="o.order_id + 1 * 2" alias="exp" start-index="7" stop-index="31" />
         </projections>
         <order-by>
             <column-item name="order_id" start-index="60" stop-index="69" nulls-order-type="LAST">
-                <owner name="o" start-index="60" stop-index="60"/>
+                <owner name="o" start-index="60" stop-index="60" />
             </column-item>
         </order-by>
     </select>
 
     <select sql-case-id="select_with_date_function">
         <from>
-            <simple-table name="t_order_item" alias="i" start-delimiter="`" end-delimiter="`" start-index="51" stop-index="69"/>
+            <simple-table name="t_order_item" alias="i" start-delimiter="`" end-delimiter="`" start-index="51" stop-index="69" />
         </from>
         <projections start-index="7" stop-index="44">
             <expression-projection text="DATE(i.creation_date)" alias="creation_date" start-index="7" stop-index="44">
@@ -57,7 +57,7 @@
                     <function function-name="DATE" alias="creation_date" start-index="7" stop-index="27" text="DATE(i.creation_date)">
                         <parameter>
                             <column name="creation_date" start-index="12" stop-index="26" >
-                                <owner name="i" start-index="12" stop-index="12"/>
+                                <owner name="i" start-index="12" stop-index="12" />
                             </column>
                         </parameter>
                     </function>
@@ -65,16 +65,16 @@
             </expression-projection>
         </projections>
         <order-by>
-            <expression-item expression="DATE(i.creation_date)" order-direction="DESC" nulls-order-type="LAST" start-index="80" stop-index="100"/>
+            <expression-item expression="DATE(i.creation_date)" order-direction="DESC" nulls-order-type="LAST" start-index="80" stop-index="100" />
         </order-by>
     </select>
 
     <select sql-case-id="select_with_regexp" parameters="'init', 1, 2">
         <from>
-            <simple-table name="t_order_item" alias="t" start-index="14" stop-index="27"/>
+            <simple-table name="t_order_item" alias="t" start-index="14" stop-index="27" />
         </from>
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="29" stop-index="75" literal-stop-index="80">
             <expr>
@@ -83,13 +83,13 @@
                         <binary-operation-expression start-index="35" stop-index="51" literal-stop-index="56">
                             <left>
                                 <column name="status" start-index="35" stop-index="42">
-                                    <owner name="t" start-index="35" stop-index="35"/>
+                                    <owner name="t" start-index="35" stop-index="35" />
                                 </column>
                             </left>
                             <operator>REGEXP</operator>
                             <right>
-                                <literal-expression value="init" start-index="51" stop-index="56"/>
-                                <parameter-marker-expression parameter-index="0" start-index="51" stop-index="51"/>
+                                <literal-expression value="init" start-index="51" stop-index="56" />
+                                <parameter-marker-expression parameter-index="0" start-index="51" stop-index="51" />
                             </right>
                         </binary-operation-expression>
                     </left>
@@ -99,18 +99,18 @@
                             <not>false</not>
                             <left>
                                 <column name="item_id" start-index="57" stop-index="65" literal-start-index="62" literal-stop-index="70">
-                                    <owner name="t" start-index="57" stop-index="57" literal-start-index="62" literal-stop-index="62"/>
+                                    <owner name="t" start-index="57" stop-index="57" literal-start-index="62" literal-stop-index="62" />
                                 </column>
                             </left>
                             <right>
                                 <list-expression start-index="70" stop-index="75" literal-start-index="75" literal-stop-index="80">
                                     <items>
-                                        <literal-expression value="1" start-index="76" stop-index="76"/>
-                                        <parameter-marker-expression parameter-index="1" start-index="71" stop-index="71"/>
+                                        <literal-expression value="1" start-index="76" stop-index="76" />
+                                        <parameter-marker-expression parameter-index="1" start-index="71" stop-index="71" />
                                     </items>
                                     <items>
-                                        <literal-expression value="2" start-index="79" stop-index="79"/>
-                                        <parameter-marker-expression parameter-index="2" start-index="74" stop-index="74"/>
+                                        <literal-expression value="2" start-index="79" stop-index="79" />
+                                        <parameter-marker-expression parameter-index="2" start-index="74" stop-index="74" />
                                     </items>
                                 </list-expression>
                             </right>
@@ -124,20 +124,20 @@
     <select sql-case-id="select_with_case_expression">
         <projections start-index="7" stop-index="124">
             <shorthand-projection start-index="7" stop-index="9">
-                <owner start-index="7" stop-index="7" name="t"/>
+                <owner start-index="7" stop-index="7" name="t" />
             </shorthand-projection>
             <column-projection start-index="11" stop-index="30" name="item_id" alias="item_id">
-                <owner start-index="11" stop-index="11" name="o"/>
+                <owner start-index="11" stop-index="11" name="o" />
             </column-projection>
-            <expression-projection text="case when t.status = 'init' then '已启用' when t.status = 'failed' then '已停用' end" start-index="33" stop-index="124" alias="stateName"/>
+            <expression-projection text="case when t.status = 'init' then '已启用' when t.status = 'failed' then '已停用' end" start-index="33" stop-index="124" alias="stateName" />
         </projections>
         <from>
             <join-table join-type="LEFT">
                 <left>
-                    <simple-table start-index="135" stop-index="143" name="t_order" alias="t"/>
+                    <simple-table start-index="135" stop-index="143" name="t_order" alias="t" />
                 </left>
                 <right>
-                    <simple-table start-index="155" stop-index="171" name="t_order_item" alias="o"/>
+                    <simple-table start-index="155" stop-index="171" name="t_order_item" alias="o" />
                 </right>
                 <on-condition>
                     <binary-operation-expression start-index="176" stop-index="197">
@@ -161,27 +161,27 @@
                 <binary-operation-expression start-index="205" stop-index="219">
                     <left>
                         <column name="order_id" start-index="205" stop-index="214">
-                            <owner name="t" start-index="205" stop-index="205"/>
+                            <owner name="t" start-index="205" stop-index="205" />
                         </column>
                     </left>
                     <operator>=</operator>
                     <right>
-                        <literal-expression value="1000" start-index="216" stop-index="219"/>
+                        <literal-expression value="1000" start-index="216" stop-index="219" />
                     </right>
                 </binary-operation-expression>
             </expr>
         </where>
         <limit start-index="221" stop-index="227">
-            <row-count value="1" start-index="227" stop-index="227"/>
+            <row-count value="1" start-index="227" stop-index="227" />
         </limit>
     </select>
 
     <select sql-case-id="select_where_with_expr_with_or" parameters="1,2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="71">
             <expr>
@@ -190,13 +190,13 @@
                         <binary-operation-expression start-index="28" stop-index="47">
                             <left>
                                 <column name="order_id" start-index="28" stop-index="43">
-                                    <owner name="t_order" start-index="28" stop-index="34"/>
+                                    <owner name="t_order" start-index="28" stop-index="34" />
                                 </column>
                             </left>
                             <operator>=</operator>
                             <right>
-                                <literal-expression value="1" start-index="47" stop-index="47"/>
-                                <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                                <literal-expression value="1" start-index="47" stop-index="47" />
+                                <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                             </right>
                         </binary-operation-expression>
                     </left>
@@ -204,13 +204,13 @@
                     <right>
                         <binary-operation-expression start-index="52" stop-index="71">
                             <left>
-                                <literal-expression value="2" start-index="52" stop-index="52"/>
-                                <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52"/>
+                                <literal-expression value="2" start-index="52" stop-index="52" />
+                                <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52" />
                             </left>
                             <operator>=</operator>
                             <right>
                                 <column name="order_id" start-index="56" stop-index="71">
-                                    <owner name="t_order" start-index="56" stop-index="62"/>
+                                    <owner name="t_order" start-index="56" stop-index="62" />
                                 </column>
                             </right>
                         </binary-operation-expression>
@@ -256,10 +256,10 @@
 
     <select sql-case-id="select_where_with_expr_with_xor" parameters="1,2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="72">
             <expr>
@@ -268,13 +268,13 @@
                         <binary-operation-expression start-index="28" stop-index="47">
                             <left>
                                 <column name="order_id" start-index="28" stop-index="43">
-                                    <owner name="t_order" start-index="28" stop-index="34"/>
+                                    <owner name="t_order" start-index="28" stop-index="34" />
                                 </column>
                             </left>
                             <operator>=</operator>
                             <right>
-                                <literal-expression value="1" start-index="47" stop-index="47"/>
-                                <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                                <literal-expression value="1" start-index="47" stop-index="47" />
+                                <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                             </right>
                         </binary-operation-expression>
                     </left>
@@ -282,13 +282,13 @@
                     <right>
                         <binary-operation-expression start-index="53" stop-index="72">
                             <left>
-                                <literal-expression value="2" start-index="53" stop-index="53"/>
-                                <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53"/>
+                                <literal-expression value="2" start-index="53" stop-index="53" />
+                                <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
                             </left>
                             <operator>=</operator>
                             <right>
                                 <column name="order_id" start-index="57" stop-index="72">
-                                    <owner name="t_order" start-index="57" stop-index="63"/>
+                                    <owner name="t_order" start-index="57" stop-index="63" />
                                 </column>
                             </right>
                         </binary-operation-expression>
@@ -300,10 +300,10 @@
 
     <select sql-case-id="select_where_with_expr_with_and" parameters="1,2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="72">
             <expr>
@@ -312,13 +312,13 @@
                         <binary-operation-expression start-index="28" stop-index="47">
                             <left>
                                 <column name="order_id" start-index="28" stop-index="43">
-                                    <owner name="t_order" start-index="28" stop-index="34"/>
+                                    <owner name="t_order" start-index="28" stop-index="34" />
                                 </column>
                             </left>
                             <operator>=</operator>
                             <right>
-                                <literal-expression value="1" start-index="47" stop-index="47"/>
-                                <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                                <literal-expression value="1" start-index="47" stop-index="47" />
+                                <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                             </right>
                         </binary-operation-expression>
                     </left>
@@ -326,13 +326,13 @@
                     <right>
                         <binary-operation-expression start-index="53" stop-index="72">
                             <left>
-                                <literal-expression value="2" start-index="53" stop-index="53"/>
-                                <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53"/>
+                                <literal-expression value="2" start-index="53" stop-index="53" />
+                                <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
                             </left>
                             <operator>=</operator>
                             <right>
                                 <column name="order_id" start-index="57" stop-index="72">
-                                    <owner name="t_order" start-index="57" stop-index="63"/>
+                                    <owner name="t_order" start-index="57" stop-index="63" />
                                 </column>
                             </right>
                         </binary-operation-expression>
@@ -344,10 +344,10 @@
 
     <select sql-case-id="select_where_with_expr_with_and_or" parameters="1,2,2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="126">
             <expr>
@@ -358,13 +358,13 @@
                                 <binary-operation-expression start-index="28" stop-index="47">
                                     <left>
                                         <column name="order_id" start-index="28" stop-index="43">
-                                            <owner name="t_order" start-index="28" stop-index="34"/>
+                                            <owner name="t_order" start-index="28" stop-index="34" />
                                         </column>
                                     </left>
                                     <operator>=</operator>
                                     <right>
-                                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                                        <literal-expression value="1" start-index="47" stop-index="47" />
+                                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                                     </right>
                                 </binary-operation-expression>
                             </left>
@@ -372,13 +372,13 @@
                             <right>
                                 <binary-operation-expression start-index="53" stop-index="72">
                                     <left>
-                                        <literal-expression value="2" start-index="53" stop-index="53"/>
-                                        <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53"/>
+                                        <literal-expression value="2" start-index="53" stop-index="53" />
+                                        <parameter-marker-expression parameter-index="1" start-index="53" stop-index="53" />
                                     </left>
                                     <operator>=</operator>
                                     <right>
                                         <column name="order_id" start-index="57" stop-index="72">
-                                            <owner name="t_order" start-index="57" stop-index="63"/>
+                                            <owner name="t_order" start-index="57" stop-index="63" />
                                         </column>
                                     </right>
                                 </binary-operation-expression>
@@ -392,12 +392,12 @@
                                 <binary-operation-expression start-index="77" stop-index="101">
                                     <left>
                                         <column name="status" start-index="77" stop-index="90">
-                                            <owner name="t_order" start-index="77" stop-index="83"/>
+                                            <owner name="t_order" start-index="77" stop-index="83" />
                                         </column>
                                     </left>
                                     <operator>=</operator>
                                     <right>
-                                        <literal-expression value="failed" start-index="94" stop-index="101"/>
+                                        <literal-expression value="failed" start-index="94" stop-index="101" />
                                     </right>
                                 </binary-operation-expression>
                             </left>
@@ -405,13 +405,13 @@
                             <right>
                                 <binary-operation-expression start-index="107" stop-index="126">
                                     <left>
-                                        <literal-expression value="2" start-index="107" stop-index="107"/>
-                                        <parameter-marker-expression parameter-index="2" start-index="107" stop-index="107"/>
+                                        <literal-expression value="2" start-index="107" stop-index="107" />
+                                        <parameter-marker-expression parameter-index="2" start-index="107" stop-index="107" />
                                     </left>
                                     <operator>=</operator>
                                     <right>
                                         <column name="order_id" start-index="111" stop-index="126">
-                                            <owner name="t_order" start-index="111" stop-index="117"/>
+                                            <owner name="t_order" start-index="111" stop-index="117" />
                                         </column>
                                     </right>
                                 </binary-operation-expression>
@@ -425,10 +425,10 @@
 
     <select sql-case-id="select_where_with_expr_with_and_sign" parameters="1,2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="71">
             <expr>
@@ -437,13 +437,13 @@
                         <binary-operation-expression start-index="28" stop-index="47">
                             <left>
                                 <column name="order_id" start-index="28" stop-index="43">
-                                    <owner name="t_order" start-index="28" stop-index="34"/>
+                                    <owner name="t_order" start-index="28" stop-index="34" />
                                 </column>
                             </left>
                             <operator>=</operator>
                             <right>
-                                <literal-expression value="1" start-index="47" stop-index="47"/>
-                                <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                                <literal-expression value="1" start-index="47" stop-index="47" />
+                                <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                             </right>
                         </binary-operation-expression>
                     </left>
@@ -451,13 +451,13 @@
                     <right>
                         <binary-operation-expression start-index="52" stop-index="71">
                             <left>
-                                <literal-expression value="2" start-index="52" stop-index="52"/>
-                                <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52"/>
+                                <literal-expression value="2" start-index="52" stop-index="52" />
+                                <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52" />
                             </left>
                             <operator>=</operator>
                             <right>
                                 <column name="order_id" start-index="56" stop-index="71">
-                                    <owner name="t_order" start-index="56" stop-index="62"/>
+                                    <owner name="t_order" start-index="56" stop-index="62" />
                                 </column>
                             </right>
                         </binary-operation-expression>
@@ -469,10 +469,10 @@
 
     <select sql-case-id="select_where_with_expr_with_not" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="53">
             <expr>
@@ -480,13 +480,13 @@
                     <expr>
                         <binary-operation-expression start-index="33" stop-index="52">
                             <left>
-                                <literal-expression value="1" start-index="33" stop-index="33"/>
-                                <parameter-marker-expression parameter-index="0" start-index="33" stop-index="33"/>
+                                <literal-expression value="1" start-index="33" stop-index="33" />
+                                <parameter-marker-expression parameter-index="0" start-index="33" stop-index="33" />
                             </left>
                             <operator>=</operator>
                             <right>
                                 <column name="order_id" start-index="37" stop-index="52">
-                                    <owner name="t_order" start-index="37" stop-index="43"/>
+                                    <owner name="t_order" start-index="37" stop-index="43" />
                                 </column>
                             </right>
                         </binary-operation-expression>
@@ -498,10 +498,10 @@
 
     <select sql-case-id="select_where_with_expr_with_not_sign" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="52">
             <expr>
@@ -509,13 +509,13 @@
                     <expr>
                         <binary-operation-expression start-index="32" stop-index="51">
                             <left>
-                                <literal-expression value="1" start-index="32" stop-index="32"/>
-                                <parameter-marker-expression parameter-index="0" start-index="32" stop-index="32"/>
+                                <literal-expression value="1" start-index="32" stop-index="32" />
+                                <parameter-marker-expression parameter-index="0" start-index="32" stop-index="32" />
                             </left>
                             <operator>=</operator>
                             <right>
                                 <column name="order_id" start-index="36" stop-index="51">
-                                    <owner name="t_order" start-index="36" stop-index="42"/>
+                                    <owner name="t_order" start-index="36" stop-index="42" />
                                 </column>
                             </right>
                         </binary-operation-expression>
@@ -527,10 +527,10 @@
 
     <select sql-case-id="select_where_with_expr_with_is" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="56">
             <expr>
@@ -538,20 +538,20 @@
                     <left>
                         <binary-operation-expression start-index="28" stop-index="47">
                             <left>
-                                <literal-expression value="1" start-index="28" stop-index="28"/>
-                                <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
+                                <literal-expression value="1" start-index="28" stop-index="28" />
+                                <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
                             </left>
                             <operator>=</operator>
                             <right>
                                 <column name="order_id" start-index="32" stop-index="47">
-                                    <owner name="t_order" start-index="32" stop-index="38"/>
+                                    <owner name="t_order" start-index="32" stop-index="38" />
                                 </column>
                             </right>
                         </binary-operation-expression>
                     </left>
                     <operator>IS</operator>
                     <right>
-                        <literal-expression value="FALSE" start-index="51" stop-index="56"/>
+                        <literal-expression value="FALSE" start-index="51" stop-index="56" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -560,10 +560,10 @@
 
     <select sql-case-id="select_where_with_expr_with_is_not" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="60">
             <expr>
@@ -571,20 +571,20 @@
                     <left>
                         <binary-operation-expression start-index="28" stop-index="47">
                             <left>
-                                <literal-expression value="1" start-index="28" stop-index="28"/>
-                                <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
+                                <literal-expression value="1" start-index="28" stop-index="28" />
+                                <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
                             </left>
                             <operator>=</operator>
                             <right>
                                 <column name="order_id" start-index="32" stop-index="47">
-                                    <owner name="t_order" start-index="32" stop-index="38"/>
+                                    <owner name="t_order" start-index="32" stop-index="38" />
                                 </column>
                             </right>
                         </binary-operation-expression>
                     </left>
                     <operator>IS</operator>
                     <right>
-                        <literal-expression value="NOT FALSE" start-index="51" stop-index="60"/>
+                        <literal-expression value="NOT FALSE" start-index="51" stop-index="60" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -593,22 +593,22 @@
 
     <select sql-case-id="select_where_with_boolean_primary_with_is">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="49">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="49">
                     <left>
                         <column name="status" start-index="28" stop-index="41">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>IS</operator>
                     <right>
-                        <literal-expression value="NULL" start-index="45" stop-index="49"/>
+                        <literal-expression value="NULL" start-index="45" stop-index="49" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -617,22 +617,22 @@
 
     <select sql-case-id="select_where_with_boolean_primary_with_is_not">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="53">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="53">
                     <left>
                         <column name="status" start-index="28" stop-index="41">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>IS</operator>
                     <right>
-                        <literal-expression value="NOT NULL" start-index="45" stop-index="53"/>
+                        <literal-expression value="NOT NULL" start-index="45" stop-index="53" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -641,23 +641,23 @@
 
     <select sql-case-id="select_where_with_boolean_primary_with_null_safe">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="62">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="62">
                     <left>
                         <column name="status" start-index="28" stop-index="41">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>&lt;=&gt;</operator>
                     <right>
                         <column name="order_id" start-index="47" stop-index="62">
-                            <owner name="t_order" start-index="47" stop-index="53"/>
+                            <owner name="t_order" start-index="47" stop-index="53" />
                         </column>
                     </right>
                 </binary-operation-expression>
@@ -667,23 +667,23 @@
 
     <select sql-case-id="select_where_with_boolean_primary_with_comparison_predicate">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="61">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="61">
                     <left>
                         <column name="status" start-index="28" stop-index="41">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>&gt;=</operator>
                     <right>
                         <column name="order_id" start-index="46" stop-index="61">
-                            <owner name="t_order" start-index="46" stop-index="52"/>
+                            <owner name="t_order" start-index="46" stop-index="52" />
                         </column>
                     </right>
                 </binary-operation-expression>
@@ -693,17 +693,17 @@
 
     <select sql-case-id="select_where_with_boolean_primary_with_comparison_subquery" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="98">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="98">
                     <left>
                         <column name="status" start-index="28" stop-index="41">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>&gt;</operator>
@@ -711,21 +711,21 @@
                         <subquery start-index="49" stop-index="98">
                             <select>
                                 <from start-index="69" stop-index="80">
-                                    <simple-table name="t_order_item" start-index="69" stop-index="80"/>
+                                    <simple-table name="t_order_item" start-index="69" stop-index="80" />
                                 </from>
                                 <projections distinct-row="false" start-index="57" stop-index="62">
-                                    <column-projection name="status" start-index="57" stop-index="62"/>
+                                    <column-projection name="status" start-index="57" stop-index="62" />
                                 </projections>
                                 <where start-index="82" stop-index="97">
                                     <expr>
                                         <binary-operation-expression start-index="88" stop-index="97">
                                             <left>
-                                                <column name="status" start-index="88" stop-index="93"/>
+                                                <column name="status" start-index="88" stop-index="93" />
                                             </left>
                                             <operator>&gt;</operator>
                                             <right>
-                                                <literal-expression value="1" start-index="97" stop-index="97"/>
-                                                <parameter-marker-expression parameter-index="0" start-index="97" stop-index="97"/>
+                                                <literal-expression value="1" start-index="97" stop-index="97" />
+                                                <parameter-marker-expression parameter-index="0" start-index="97" stop-index="97" />
                                             </right>
                                         </binary-operation-expression>
                                     </expr>
@@ -740,10 +740,10 @@
 
     <select sql-case-id="select_where_with_predicate_with_in_subquery" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="103">
             <expr>
@@ -751,28 +751,28 @@
                     <not>true</not>
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <right>
                         <subquery start-index="52" stop-index="103">
                             <select>
                                 <from start-index="74" stop-index="85">
-                                    <simple-table name="t_order_item" start-index="74" stop-index="85"/>
+                                    <simple-table name="t_order_item" start-index="74" stop-index="85" />
                                 </from>
                                 <projections distinct-row="false" start-index="60" stop-index="67">
-                                    <column-projection name="order_id" start-index="60" stop-index="67"/>
+                                    <column-projection name="order_id" start-index="60" stop-index="67" />
                                 </projections>
                                 <where start-index="87" stop-index="102">
                                     <expr>
                                         <binary-operation-expression start-index="93" stop-index="102">
                                             <left>
-                                                <column name="status" start-index="93" stop-index="98"/>
+                                                <column name="status" start-index="93" stop-index="98" />
                                             </left>
                                             <operator>&gt;</operator>
                                             <right>
-                                                <literal-expression value="1" start-index="102" stop-index="102"/>
-                                                <parameter-marker-expression parameter-index="0" start-index="102" stop-index="102"/>
+                                                <literal-expression value="1" start-index="102" stop-index="102" />
+                                                <parameter-marker-expression parameter-index="0" start-index="102" stop-index="102" />
                                             </right>
                                         </binary-operation-expression>
                                     </expr>
@@ -787,10 +787,10 @@
 
     <select sql-case-id="select_where_with_predicate_with_in_expr" parameters="1,2,3">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="56">
             <expr>
@@ -798,22 +798,22 @@
                     <not>false</not>
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <right>
                         <list-expression start-index="48" stop-index="56">
                             <items>
-                                <literal-expression value="1" start-index="49" stop-index="49"/>
-                                <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49"/>
+                                <literal-expression value="1" start-index="49" stop-index="49" />
+                                <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49" />
                             </items>
                             <items>
-                                <literal-expression value="2" start-index="52" stop-index="52"/>
-                                <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52"/>
+                                <literal-expression value="2" start-index="52" stop-index="52" />
+                                <parameter-marker-expression parameter-index="1" start-index="52" stop-index="52" />
                             </items>
                             <items>
-                                <literal-expression value="3" start-index="55" stop-index="55"/>
-                                <parameter-marker-expression parameter-index="2" start-index="55" stop-index="55"/>
+                                <literal-expression value="3" start-index="55" stop-index="55" />
+                                <parameter-marker-expression parameter-index="2" start-index="55" stop-index="55" />
                             </items>
                         </list-expression>
                     </right>
@@ -824,10 +824,10 @@
 
     <select sql-case-id="select_where_with_predicate_with_between" parameters="1,2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="59">
             <expr>
@@ -835,16 +835,16 @@
                     <not>false</not>
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <between-expr>
-                        <literal-expression value="1" start-index="53" stop-index="53"/>
-                        <parameter-marker-expression parameter-index="0" start-index="53" stop-index="53"/>
+                        <literal-expression value="1" start-index="53" stop-index="53" />
+                        <parameter-marker-expression parameter-index="0" start-index="53" stop-index="53" />
                     </between-expr>
                     <and-expr>
-                        <literal-expression value="2" start-index="59" stop-index="59"/>
-                        <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59"/>
+                        <literal-expression value="2" start-index="59" stop-index="59" />
+                        <parameter-marker-expression parameter-index="1" start-index="59" stop-index="59" />
                     </and-expr>
                 </between-expression>
             </expr>
@@ -853,22 +853,22 @@
 
     <select sql-case-id="select_where_with_predicate_with_sounds_like">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="60">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="60">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>SOUNDS LIKE</operator>
                     <right>
-                        <literal-expression value="1%" start-index="57" stop-index="60"/>
+                        <literal-expression value="1%" start-index="57" stop-index="60" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -877,27 +877,27 @@
 
     <select sql-case-id="select_where_with_predicate_with_like">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="68">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="68">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>NOT LIKE</operator>
                     <right>
                         <list-expression start-index="54" stop-index="68">
                             <items>
-                                <literal-expression value="1%" start-index="54" stop-index="57"/>
+                                <literal-expression value="1%" start-index="54" stop-index="57" />
                             </items>
                             <items>
-                                <literal-expression value="$" start-index="66" stop-index="68"/>
+                                <literal-expression value="$" start-index="66" stop-index="68" />
                             </items>
                         </list-expression>
                     </right>
@@ -908,24 +908,24 @@
 
     <select sql-case-id="select_where_with_predicate_with_not_like">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="55">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="55">
                     <left>
                         <column name="status" start-index="28" stop-index="41">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>NOT LIKE</operator>
                     <right>
                         <list-expression start-index="52" stop-index="55">
                             <items>
-                                <literal-expression value="1%" start-index="52" stop-index="55"/>
+                                <literal-expression value="1%" start-index="52" stop-index="55" />
                             </items>
                         </list-expression>
                     </right>
@@ -936,22 +936,22 @@
 
     <select sql-case-id="select_where_with_predicate_with_regexp">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="62">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="62">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>NOT REGEXP</operator>
                     <right>
-                        <literal-expression value="[123]" start-index="56" stop-index="62"/>
+                        <literal-expression value="[123]" start-index="56" stop-index="62" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -960,23 +960,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_vertical_bar" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>|</operator>
                     <right>
-                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                        <literal-expression value="1" start-index="47" stop-index="47" />
+                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -985,23 +985,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_ampersand" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>&amp;</operator>
                     <right>
-                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                        <literal-expression value="1" start-index="47" stop-index="47" />
+                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1010,23 +1010,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_signed_left_shift" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="48">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="48">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>&lt;&lt;</operator>
                     <right>
-                        <literal-expression value="1" start-index="48" stop-index="48"/>
-                        <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48"/>
+                        <literal-expression value="1" start-index="48" stop-index="48" />
+                        <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1035,23 +1035,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_signed_right_shift" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="48">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="48">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>&gt;&gt;</operator>
                     <right>
-                        <literal-expression value="1" start-index="48" stop-index="48"/>
-                        <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48"/>
+                        <literal-expression value="1" start-index="48" stop-index="48" />
+                        <parameter-marker-expression parameter-index="0" start-index="48" stop-index="48" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1060,23 +1060,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_plus" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>+</operator>
                     <right>
-                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                        <literal-expression value="1" start-index="47" stop-index="47" />
+                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1085,23 +1085,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_minus" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>-</operator>
                     <right>
-                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                        <literal-expression value="1" start-index="47" stop-index="47" />
+                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1110,23 +1110,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_asterisk" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>*</operator>
                     <right>
-                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                        <literal-expression value="1" start-index="47" stop-index="47" />
+                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1135,23 +1135,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_slash" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>/</operator>
                     <right>
-                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                        <literal-expression value="1" start-index="47" stop-index="47" />
+                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1160,23 +1160,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_div" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="49">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="49">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>DIV</operator>
                     <right>
-                        <literal-expression value="1" start-index="49" stop-index="49"/>
-                        <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49"/>
+                        <literal-expression value="1" start-index="49" stop-index="49" />
+                        <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1185,23 +1185,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_mod" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="49">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="49">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>MOD</operator>
                     <right>
-                        <literal-expression value="1" start-index="49" stop-index="49"/>
-                        <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49"/>
+                        <literal-expression value="1" start-index="49" stop-index="49" />
+                        <parameter-marker-expression parameter-index="0" start-index="49" stop-index="49" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1210,23 +1210,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_mod_sign" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>%</operator>
                     <right>
-                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                        <literal-expression value="1" start-index="47" stop-index="47" />
+                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1235,23 +1235,23 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_caret" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>^</operator>
                     <right>
-                        <literal-expression value="1" start-index="47" stop-index="47"/>
-                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47"/>
+                        <literal-expression value="1" start-index="47" stop-index="47" />
+                        <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1260,17 +1260,17 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_plus_interval">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="63">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="63">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>+</operator>
@@ -1284,17 +1284,17 @@
 
     <select sql-case-id="select_where_with_bit_expr_with_minus_interval">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="63">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="63">
                     <left>
                         <column name="order_id" start-index="28" stop-index="43">
-                            <owner name="t_order" start-index="28" stop-index="34"/>
+                            <owner name="t_order" start-index="28" stop-index="34" />
                         </column>
                     </left>
                     <operator>-</operator>
@@ -1308,21 +1308,21 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_literals" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="39">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="39">
                     <left>
-                        <literal-expression value="1" start-index="28" stop-index="28"/>
-                        <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
+                        <literal-expression value="1" start-index="28" stop-index="28" />
+                        <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
                     </left>
                     <operator>&lt;</operator>
                     <right>
-                        <column name="order_id" start-index="32" stop-index="39"/>
+                        <column name="order_id" start-index="32" stop-index="39" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1331,15 +1331,15 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_column">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="43">
             <expr>
                 <column name="order_id" start-index="28" stop-index="43">
-                    <owner name="t_order" start-index="28" stop-index="34"/>
+                    <owner name="t_order" start-index="28" stop-index="34" />
                 </column>
             </expr>
         </where>
@@ -1347,10 +1347,10 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_function_call">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="43">
             <expr>
@@ -1360,7 +1360,7 @@
                     </left>
                     <operator>&lt;</operator>
                     <right>
-                        <column name="order_id" start-index="36" stop-index="43"/>
+                        <column name="order_id" start-index="36" stop-index="43" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1369,17 +1369,17 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_collate">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="45" literal-stop-index="64">
             <expr>
                 <collate-expression start-index="28" stop-index="45" literal-stop-index="64">
                     <collate-name>
-                        <literal-expression value="'utf8mb4_0900_ai_ci'" start-index="37" stop-index="64"/>
-                        <parameter-marker-expression parameter-index="0" start-index="37" stop-index="45"/>
+                        <literal-expression value="'utf8mb4_0900_ai_ci'" start-index="37" stop-index="64" />
+                        <parameter-marker-expression parameter-index="0" start-index="37" stop-index="45" />
                     </collate-name>
                 </collate-expression>
             </expr>
@@ -1388,20 +1388,20 @@
     
     <select sql-case-id="select_where_with_simple_expr_with_variable">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="55">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="55">
                     <left>
-                        <common-expression text="@@max_connections" start-index="28" stop-index="44"/>
+                        <common-expression text="@@max_connections" start-index="28" stop-index="44" />
                     </left>
                     <operator>&lt;</operator>
                     <right>
-                        <column name="order_id" start-index="48" stop-index="55"/>
+                        <column name="order_id" start-index="48" stop-index="55" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1410,22 +1410,22 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_plus" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
-                        <literal-expression value="1" start-index="28" stop-index="28"/>
-                        <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
+                        <literal-expression value="1" start-index="28" stop-index="28" />
+                        <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
                     </left>
                     <operator>+</operator>
                     <right>
                         <column name="order_id" start-index="32" stop-index="47">
-                            <owner name="t_order" start-index="32" stop-index="38"/>
+                            <owner name="t_order" start-index="32" stop-index="38" />
                         </column>
                     </right>
                 </binary-operation-expression>
@@ -1435,22 +1435,22 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_minus" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="47">
             <expr>
                 <binary-operation-expression start-index="28" stop-index="47">
                     <left>
-                        <literal-expression value="1" start-index="28" stop-index="28"/>
-                        <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28"/>
+                        <literal-expression value="1" start-index="28" stop-index="28" />
+                        <parameter-marker-expression parameter-index="0" start-index="28" stop-index="28" />
                     </left>
                     <operator>-</operator>
                     <right>
                         <column name="order_id" start-index="32" stop-index="47">
-                            <owner name="t_order" start-index="32" stop-index="38"/>
+                            <owner name="t_order" start-index="32" stop-index="38" />
                         </column>
                     </right>
                 </binary-operation-expression>
@@ -1460,31 +1460,31 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_tilde">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="44">
             <expr>
-                <common-expression text="~t_order.order_id" start-index="28" stop-index="44"/>
+                <common-expression text="~t_order.order_id" start-index="28" stop-index="44" />
             </expr>
         </where>
     </select>
 
     <select sql-case-id="select_where_with_simple_expr_with_not">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="44">
             <expr>
                 <not-expression start-index="28" stop-index="44">
                     <expr>
                         <column name="order_id" start-index="29" stop-index="44">
-                            <owner name="t_order" start-index="29" stop-index="35"/>
+                            <owner name="t_order" start-index="29" stop-index="35" />
                         </column>
                     </expr>
                 </not-expression>
@@ -1494,10 +1494,10 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_binary">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="50">
             <expr>
@@ -1510,10 +1510,10 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_binary_value" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="54">
             <expr>
@@ -1544,11 +1544,11 @@
             <expr>
                 <binary-operation-expression start-index="28" stop-index="61" literal-stop-index="65">
                     <left>
-                        <common-expression text="ROW(?, now())" literal-text="ROW('abc', now())" start-index="28" stop-index="40" literal-stop-index="44"/>
+                        <common-expression text="ROW(?, now())" literal-text="ROW('abc', now())" start-index="28" stop-index="40" literal-stop-index="44" />
                     </left>
                     <operator>=</operator>
                     <right>
-                        <common-expression text="(order_id, status)" start-index="44" stop-index="61" literal-start-index="48" literal-stop-index="65"/>
+                        <common-expression text="(order_id, status)" start-index="44" stop-index="61" literal-start-index="48" literal-stop-index="65" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -1557,31 +1557,31 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_subquery" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="79">
             <expr>
                 <subquery start-index="28" stop-index="79">
                     <select>
                         <from start-index="50" stop-index="61">
-                            <simple-table name="t_order_item" start-index="50" stop-index="61"/>
+                            <simple-table name="t_order_item" start-index="50" stop-index="61" />
                         </from>
                         <projections distinct-row="false" start-index="36" stop-index="43">
-                            <column-projection name="order_id" start-index="36" stop-index="43"/>
+                            <column-projection name="order_id" start-index="36" stop-index="43" />
                         </projections>
                         <where start-index="63" stop-index="78">
                             <expr>
                                 <binary-operation-expression start-index="69" stop-index="78">
                                     <left>
-                                        <column name="status" start-index="69" stop-index="74"/>
+                                        <column name="status" start-index="69" stop-index="74" />
                                     </left>
                                     <operator>&gt;</operator>
                                     <right>
-                                        <literal-expression value="1" start-index="78" stop-index="78"/>
-                                        <parameter-marker-expression parameter-index="0" start-index="78" stop-index="78"/>
+                                        <literal-expression value="1" start-index="78" stop-index="78" />
+                                        <parameter-marker-expression parameter-index="0" start-index="78" stop-index="78" />
                                     </right>
                                 </binary-operation-expression>
                             </expr>
@@ -1594,10 +1594,10 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_exists_subquery" parameters="1">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="87">
             <expr>
@@ -1606,21 +1606,21 @@
                     <subquery start-index="35" stop-index="87">
                         <select>
                             <from start-index="57" stop-index="68">
-                                <simple-table name="t_order_item" start-index="57" stop-index="68"/>
+                                <simple-table name="t_order_item" start-index="57" stop-index="68" />
                             </from>
                             <projections distinct-row="false" start-index="43" stop-index="50">
-                                <column-projection name="order_id" start-index="43" stop-index="50"/>
+                                <column-projection name="order_id" start-index="43" stop-index="50" />
                             </projections>
                             <where start-index="70" stop-index="85">
                                 <expr>
                                     <binary-operation-expression start-index="76" stop-index="85">
                                         <left>
-                                            <column name="status" start-index="76" stop-index="81"/>
+                                            <column name="status" start-index="76" stop-index="81" />
                                         </left>
                                         <operator>&gt;</operator>
                                         <right>
-                                            <literal-expression value="1" start-index="85" stop-index="85"/>
-                                            <parameter-marker-expression parameter-index="0" start-index="85" stop-index="85"/>
+                                            <literal-expression value="1" start-index="85" stop-index="85" />
+                                            <parameter-marker-expression parameter-index="0" start-index="85" stop-index="85" />
                                         </right>
                                     </binary-operation-expression>
                                 </expr>
@@ -1641,17 +1641,17 @@
         </projections>
         <where start-index="22" stop-index="33" literal-stop-index="53">
             <expr>
-                <common-expression text="{ts ?}" literal-text="{ts '1994-02-04 12:23:00'}" start-index="28" stop-index="33" literal-stop-index="53"/>
+                <common-expression text="{ts ?}" literal-text="{ts '1994-02-04 12:23:00'}" start-index="28" stop-index="33" literal-stop-index="53" />
             </expr>
         </where>
     </select>
 
     <select sql-case-id="select_where_with_simple_expr_with_json_extract_sign">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="44">
             <expr>
@@ -1662,10 +1662,10 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_json_unquote_extract_sign">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="46">
             <expr>
@@ -1676,10 +1676,10 @@
 
     <select sql-case-id="select_where_with_simple_expr_with_json_contains">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="76">
             <expr>
@@ -1697,7 +1697,7 @@
         </projections>
         <where start-index="22" stop-index="80" literal-stop-index="88">
             <expr>
-                <common-expression text="MATCH (order_id) AGAINST (? IN NATURAL LANGUAGE MODE)" literal-text="MATCH (order_id) AGAINST ('keyword' IN NATURAL LANGUAGE MODE)" start-index="28" stop-index="80" literal-stop-index="88"/>
+                <common-expression text="MATCH (order_id) AGAINST (? IN NATURAL LANGUAGE MODE)" literal-text="MATCH (order_id) AGAINST ('keyword' IN NATURAL LANGUAGE MODE)" start-index="28" stop-index="80" literal-stop-index="88" />
             </expr>
         </where>
     </select>
@@ -1718,7 +1718,7 @@
 
     <select sql-case-id="select_where_with_expr_with_not_with_order_by">
         <from start-index="53" stop-index="61">
-            <simple-table name="employees" start-index="53" stop-index="61"/>
+            <simple-table name="employees" start-index="53" stop-index="61" />
         </from>
         <projections start-index="7" stop-index="46">
             <column-projection name="last_name" start-index="7" stop-index="15" />
@@ -1766,7 +1766,7 @@
 
     <select sql-case-id="select_where_with_subquery">
         <from start-index="37" stop-index="45">
-            <simple-table name="employees" start-index="37" stop-index="45"/>
+            <simple-table name="employees" start-index="37" stop-index="45" />
         </from>
         <projections start-index="7" stop-index="30">
             <column-projection name="last_name" start-index="7" stop-index="15" />
@@ -1776,23 +1776,23 @@
             <expr>
                 <binary-operation-expression start-index="53" stop-index="133">
                     <left>
-                        <column name="department_id" start-index="53" stop-index="65"/>
+                        <column name="department_id" start-index="53" stop-index="65" />
                     </left>
                     <operator>=</operator>
                     <right>
                         <subquery start-index="69" stop-index="133">
                             <select>
                                 <from start-index="96" stop-index="104">
-                                    <simple-table name="employees" start-index="96" stop-index="104"/>
+                                    <simple-table name="employees" start-index="96" stop-index="104" />
                                 </from>
                                 <projections start-index="77" stop-index="89">
-                                    <column-projection name="department_id" start-index="77" stop-index="89"/>
+                                    <column-projection name="department_id" start-index="77" stop-index="89" />
                                 </projections>
                                 <where start-index="106" stop-index="132">
                                     <expr>
                                         <binary-operation-expression start-index="112" stop-index="132">
                                             <left>
-                                                <column name="last_name" start-index="112" stop-index="120"/>
+                                                <column name="last_name" start-index="112" stop-index="120" />
                                             </left>
                                             <operator>=</operator>
                                             <right>
@@ -1815,10 +1815,10 @@
 
     <select sql-case-id="select_where_with_expr_with_not_in">
         <from start-index="14" stop-index="22">
-            <simple-table name="employees" start-index="14" stop-index="22"/>
+            <simple-table name="employees" start-index="14" stop-index="22" />
         </from>
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="24" stop-index="114">
             <expr>
@@ -1866,10 +1866,10 @@
                 <expr>
                     <binary-operation-expression start-index="7" stop-index="11">
                         <left>
-                            <literal-expression value="10" start-index="7" stop-index="8"/>
+                            <literal-expression value="10" start-index="7" stop-index="8" />
                         </left>
                         <right>
-                            <literal-expression value="20" start-index="10" stop-index="11"/>
+                            <literal-expression value="20" start-index="10" stop-index="11" />
                         </right>
                         <operator>+</operator>
                     </binary-operation-expression>
@@ -1877,12 +1877,12 @@
             </expression-projection>
             <expression-projection start-index="13" stop-index="56" text="CASE order_id WHEN 1 THEN '11' ELSE '00' END">
                 <expr>
-                    <common-expression literal-text="CASE order_id WHEN 1 THEN '11' ELSE '00' END" start-index="13" stop-index="56"/>
+                    <common-expression literal-text="CASE order_id WHEN 1 THEN '11' ELSE '00' END" start-index="13" stop-index="56" />
                 </expr>
             </expression-projection>
             <expression-projection start-index="58" stop-index="58" text="1">
                 <expr>
-                    <literal-expression value="1" start-index="58" stop-index="58"/>
+                    <literal-expression value="1" start-index="58" stop-index="58" />
                 </expr>
             </expression-projection>
         </projections>
@@ -1901,10 +1901,10 @@
                             <column name="order_id" start-index="18" stop-index="25" />
                         </case-arg>
                         <when-list>
-                            <literal-expression value="1" start-index="32" stop-index="32"/>
+                            <literal-expression value="1" start-index="32" stop-index="32" />
                         </when-list>
                         <then-list>
-                            <literal-expression value="11" start-index="39" stop-index="42"/>
+                            <literal-expression value="11" start-index="39" stop-index="42" />
                         </then-list>
                         <else-expression>
                             <literal-expression value="00" start-index="49" stop-index="52" />
@@ -1914,7 +1914,7 @@
             </expression-projection>
             <expression-projection start-index="58" stop-index="58" text="1">
                 <expr>
-                    <literal-expression value="1" start-index="58" stop-index="58"/>
+                    <literal-expression value="1" start-index="58" stop-index="58" />
                 </expr>
             </expression-projection>
         </projections>
@@ -1932,10 +1932,10 @@
                             <column name="order_id" start-index="12" stop-index="19" />
                         </case-arg>
                         <when-list>
-                            <literal-expression value="1" start-index="26" stop-index="26"/>
+                            <literal-expression value="1" start-index="26" stop-index="26" />
                         </when-list>
                         <then-list>
-                            <literal-expression value="11" start-index="33" stop-index="36"/>
+                            <literal-expression value="11" start-index="33" stop-index="36" />
                         </then-list>
                         <else-expression>
                             <literal-expression value="00" start-index="43" stop-index="46" />
@@ -1951,13 +1951,13 @@
 
     <select sql-case-id="select_with_amp">
         <projections start-index="7" stop-index="11">
-            <expression-projection text="1 &amp; 1" start-index="7" stop-index="11"/>
+            <expression-projection text="1 &amp; 1" start-index="7" stop-index="11" />
         </projections>
     </select>
 
     <select sql-case-id="select_with_vertical_bar">
         <projections start-index="7" stop-index="11">
-            <expression-projection text="1 | 1" start-index="7" stop-index="11"/>
+            <expression-projection text="1 | 1" start-index="7" stop-index="11" />
         </projections>
     </select>
 
@@ -1970,7 +1970,7 @@
                 <expr>
                     <function function-name="ABS" text="ABS(1)" start-index="7" stop-index="12">
                         <parameter>
-                            <literal-expression value="1" start-index="11" stop-index="11"/>
+                            <literal-expression value="1" start-index="11" stop-index="11" />
                         </parameter>
                     </function>
                 </expr>
@@ -1982,7 +1982,7 @@
                     <left>
                         <function function-name="ABS" text="ABS(1)" start-index="33" stop-index="38">
                             <parameter>
-                                <literal-expression value="1" start-index="37" stop-index="37"/>
+                                <literal-expression value="1" start-index="37" stop-index="37" />
                             </parameter>
                         </function>
                     </left>
@@ -1998,7 +1998,7 @@
                 <expr>
                     <function function-name="ABS" text="ABS(1)" start-index="53" stop-index="58">
                         <parameter>
-                            <literal-expression value="1" start-index="57" stop-index="57"/>
+                            <literal-expression value="1" start-index="57" stop-index="57" />
                         </parameter>
                     </function>
                 </expr>
@@ -2009,7 +2009,7 @@
                 <expr>
                     <function function-name="ABS" text="ABS(1)" start-index="69" stop-index="74">
                         <parameter>
-                            <literal-expression value="1" start-index="73" stop-index="73"/>
+                            <literal-expression value="1" start-index="73" stop-index="73" />
                         </parameter>
                     </function>
                 </expr>
@@ -2026,7 +2026,7 @@
                 <expr>
                     <function function-name="A" text="A(1)" start-index="7" stop-index="10">
                         <parameter>
-                            <literal-expression value="1" start-index="9" stop-index="9"/>
+                            <literal-expression value="1" start-index="9" stop-index="9" />
                         </parameter>
                     </function>
                 </expr>
@@ -2038,7 +2038,7 @@
                     <left>
                         <function function-name="A" text="A(1)" start-index="31" stop-index="34">
                             <parameter>
-                                <literal-expression value="1" start-index="33" stop-index="33"/>
+                                <literal-expression value="1" start-index="33" stop-index="33" />
                             </parameter>
                         </function>
                     </left>
@@ -2082,7 +2082,7 @@
                 <expr>
                     <function function-name="A" text="A(1)" start-index="7" stop-index="10">
                         <parameter>
-                            <literal-expression value="1" start-index="9" stop-index="9"/>
+                            <literal-expression value="1" start-index="9" stop-index="9" />
                         </parameter>
                     </function>
                 </expr>
@@ -2094,7 +2094,7 @@
                     <left>
                         <function function-name="A" text="A(1)" start-index="31" stop-index="34">
                             <parameter>
-                                <literal-expression value="1" start-index="33" stop-index="33"/>
+                                <literal-expression value="1" start-index="33" stop-index="33" />
                             </parameter>
                         </function>
                     </left>
@@ -2135,8 +2135,8 @@
             <expr>
                 <collate-expression start-index="28" stop-index="45" literal-stop-index="54">
                     <collate-name>
-                        <literal-expression value="latin1_bin" start-index="37" stop-index="54"/>
-                        <parameter-marker-expression parameter-index="0" start-index="37" stop-index="45"/>
+                        <literal-expression value="latin1_bin" start-index="37" stop-index="54" />
+                        <parameter-marker-expression parameter-index="0" start-index="37" stop-index="45" />
                     </collate-name>
                 </collate-expression>
             </expr>
diff --git a/test/parser/src/main/resources/case/dml/select-group-by.xml b/test/parser/src/main/resources/case/dml/select-group-by.xml
index 611653db1da..5611321e2c6 100644
--- a/test/parser/src/main/resources/case/dml/select-group-by.xml
+++ b/test/parser/src/main/resources/case/dml/select-group-by.xml
@@ -120,7 +120,7 @@
                     <simple-table name="t_order" alias="o" start-index="36" stop-index="44" />
                 </left>
                 <right>
-                    <simple-table name="t_order_item" alias="i" start-index="51" stop-index="64"/>
+                    <simple-table name="t_order_item" alias="i" start-index="51" stop-index="64" />
                 </right>
                 <on-condition>
                     <binary-operation-expression start-index="69" stop-index="117">
@@ -368,7 +368,7 @@
                     </left>
                     <operator>&gt;</operator>
                     <right>
-                        <literal-expression start-index="100" stop-index="100" value="0"/>
+                        <literal-expression start-index="100" stop-index="100" value="0" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -394,7 +394,7 @@
                     </left>
                     <operator>&gt;</operator>
                     <right>
-                        <literal-expression start-index="87" stop-index="87" value="0"/>
+                        <literal-expression start-index="87" stop-index="87" value="0" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -556,7 +556,7 @@
                     </left>
                     <operator>&lt;</operator>
                     <right>
-                        <literal-expression value="5000" start-index="106" stop-index="109"/>
+                        <literal-expression value="5000" start-index="106" stop-index="109" />
                     </right>
                 </binary-operation-expression>
             </expr>
@@ -589,24 +589,24 @@
                         <subquery start-index="121" stop-index="219">
                             <select>
                                 <from start-index="160" stop-index="170">
-                                    <simple-table name="employees" alias="x" start-index="160" stop-index="170"/>
+                                    <simple-table name="employees" alias="x" start-index="160" stop-index="170" />
                                 </from>
                                 <projections start-index="129" stop-index="153">
-                                    <column-projection name="department_id" start-index="129" stop-index="141"/>
-                                    <column-projection name="manager_id" start-index="144" stop-index="153"/>
+                                    <column-projection name="department_id" start-index="129" stop-index="141" />
+                                    <column-projection name="manager_id" start-index="144" stop-index="153" />
                                 </projections>
                                 <where start-index="172" stop-index="218">
                                     <expr>
                                         <binary-operation-expression start-index="178" stop-index="218">
                                             <left>
                                                 <column name="department_id" start-index="178" stop-index="192">
-                                                    <owner name="x" start-index="178" stop-index="178"/>
+                                                    <owner name="x" start-index="178" stop-index="178" />
                                                 </column>
                                             </left>
                                             <operator>=</operator>
                                             <right>
                                                 <column name="department_id" start-index="196" stop-index="218">
-                                                    <owner name="employees" start-index="196" stop-index="204"/>
+                                                    <owner name="employees" start-index="196" stop-index="204" />
                                                 </column>
                                             </right>
                                         </binary-operation-expression>
diff --git a/test/parser/src/main/resources/case/dml/select-into.xml b/test/parser/src/main/resources/case/dml/select-into.xml
index 43e50552e04..49f7c95b83f 100644
--- a/test/parser/src/main/resources/case/dml/select-into.xml
+++ b/test/parser/src/main/resources/case/dml/select-into.xml
@@ -19,10 +19,10 @@
 <sql-parser-test-cases>
     <select sql-case-id="select_into_before_from" parameters="1">
         <from start-index="30" stop-index="36">
-            <simple-table name="t_order" start-index="30" stop-index="36"/>
+            <simple-table name="t_order" start-index="30" stop-index="36" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="12">
-            <column-projection name="status" start-index="7" stop-index="12"/>
+            <column-projection name="status" start-index="7" stop-index="12" />
         </projections>
         <where start-index="38" stop-index="55">
             <expr>
@@ -42,10 +42,10 @@
 
     <select sql-case-id="select_into_after_from" parameters="1">
         <from start-index="19" stop-index="25">
-            <simple-table name="t_order" start-index="19" stop-index="25"/>
+            <simple-table name="t_order" start-index="19" stop-index="25" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="12">
-            <column-projection name="status" start-index="7" stop-index="12"/>
+            <column-projection name="status" start-index="7" stop-index="12" />
         </projections>
         <where start-index="27" stop-index="44">
             <expr>
@@ -65,11 +65,11 @@
 
     <select sql-case-id="select_into_multi_variable" parameters="1">
         <from start-index="28" stop-index="34">
-            <simple-table name="t_order" start-index="28" stop-index="34"/>
+            <simple-table name="t_order" start-index="28" stop-index="34" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="21">
-            <column-projection name="user_id" start-index="7" stop-index="13"/>
-            <column-projection name="status" start-index="16" stop-index="21"/>
+            <column-projection name="user_id" start-index="7" stop-index="13" />
+            <column-projection name="status" start-index="16" stop-index="21" />
         </projections>
         <where start-index="36" stop-index="53">
             <expr>
@@ -89,71 +89,71 @@
 
     <select sql-case-id="select_into_out_file" parameters="2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <limit start-index="22" stop-index="28">
-            <row-count value="2" parameter-index="0" start-index="28" stop-index="28"/>
+            <row-count value="2" parameter-index="0" start-index="28" stop-index="28" />
         </limit>
     </select>
 
     <select sql-case-id="select_into_out_file_with_charset" parameters="2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <limit start-index="22" stop-index="28">
-            <row-count value="2" parameter-index="0" start-index="28" stop-index="28"/>
+            <row-count value="2" parameter-index="0" start-index="28" stop-index="28" />
         </limit>
     </select>
 
     <select sql-case-id="select_into_out_file_with_fields" parameters="2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <limit start-index="22" stop-index="28">
-            <row-count value="2" parameter-index="0" start-index="28" stop-index="28"/>
+            <row-count value="2" parameter-index="0" start-index="28" stop-index="28" />
         </limit>
     </select>
 
     <select sql-case-id="select_into_out_file_with_fields_and_escaped" parameters="2">
         <from start-index="28" stop-index="34">
-            <simple-table name="t_order" start-index="28" stop-index="34"/>
+            <simple-table name="t_order" start-index="28" stop-index="34" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="21">
-            <column-projection name="user_id" start-index="7" stop-index="13"/>
-            <column-projection name="status" start-index="16" stop-index="21"/>
+            <column-projection name="user_id" start-index="7" stop-index="13" />
+            <column-projection name="status" start-index="16" stop-index="21" />
         </projections>
         <limit start-index="36" stop-index="42">
-            <row-count value="2" parameter-index="0" start-index="42" stop-index="42"/>
+            <row-count value="2" parameter-index="0" start-index="42" stop-index="42" />
         </limit>
     </select>
 
     <select sql-case-id="select_into_out_file_with_lines" parameters="2">
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <limit start-index="22" stop-index="28">
-            <row-count value="2" parameter-index="0" start-index="28" stop-index="28"/>
+            <row-count value="2" parameter-index="0" start-index="28" stop-index="28" />
         </limit>
     </select>
 
     <select sql-case-id="select_into_with_lock_after_into" parameters="1">
         <from start-index="19" stop-index="25">
-            <simple-table name="t_order" start-index="19" stop-index="25"/>
+            <simple-table name="t_order" start-index="19" stop-index="25" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="12">
-            <column-projection name="status" start-index="7" stop-index="12"/>
+            <column-projection name="status" start-index="7" stop-index="12" />
         </projections>
         <where start-index="27" stop-index="44">
             <expr>
@@ -169,15 +169,15 @@
                 </binary-operation-expression>
             </expr>
         </where>
-        <lock start-index="57" stop-index="66"/>
+        <lock start-index="57" stop-index="66" />
     </select>
 
     <select sql-case-id="select_into_with_lock_before_into" parameters="1">
         <from start-index="19" stop-index="25">
-            <simple-table name="t_order" start-index="19" stop-index="25"/>
+            <simple-table name="t_order" start-index="19" stop-index="25" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="12">
-            <column-projection name="status" start-index="7" stop-index="12"/>
+            <column-projection name="status" start-index="7" stop-index="12" />
         </projections>
         <where start-index="27" stop-index="44">
             <expr>
@@ -193,7 +193,7 @@
                 </binary-operation-expression>
             </expr>
         </where>
-        <lock start-index="46" stop-index="55"/>
+        <lock start-index="46" stop-index="55" />
     </select>
     
     <select sql-case-id="select_into_param_without_at">
diff --git a/test/parser/src/main/resources/case/dml/select-join.xml b/test/parser/src/main/resources/case/dml/select-join.xml
index 722368b63de..ed12dfde4d6 100644
--- a/test/parser/src/main/resources/case/dml/select-join.xml
+++ b/test/parser/src/main/resources/case/dml/select-join.xml
@@ -178,10 +178,10 @@
         </from>
         <projections start-index="7" stop-index="34">
             <column-projection name="department_id" start-index="7" stop-index="21">
-                <owner name="d" start-index="7" stop-index="7"/>
+                <owner name="d" start-index="7" stop-index="7" />
             </column-projection>
             <column-projection name="last_name" start-index="24" stop-index="34">
-                <owner name="e" start-index="24" stop-index="24"/>
+                <owner name="e" start-index="24" stop-index="24" />
             </column-projection>
         </projections>
         <order-by>
@@ -207,13 +207,13 @@
                     <binary-operation-expression start-index="87" stop-index="119">
                         <left>
                             <column name="department_id" start-index="87" stop-index="101">
-                                <owner name="d" start-index="87" stop-index="87"/>
+                                <owner name="d" start-index="87" stop-index="87" />
                             </column>
                         </left>
                         <operator>=</operator>
                         <right>
                             <column name="department_id" start-index="105" stop-index="119">
-                                <owner name="e" start-index="105" stop-index="105"/>
+                                <owner name="e" start-index="105" stop-index="105" />
                             </column>
                         </right>
                     </binary-operation-expression>
@@ -222,10 +222,10 @@
         </from>
         <projections start-index="7" stop-index="34">
             <column-projection name="department_id" start-index="7" stop-index="21">
-                <owner name="d" start-index="7" stop-index="7"/>
+                <owner name="d" start-index="7" stop-index="7" />
             </column-projection>
             <column-projection name="last_name" start-index="24" stop-index="34">
-                <owner name="e" start-index="24" stop-index="24"/>
+                <owner name="e" start-index="24" stop-index="24" />
             </column-projection>
         </projections>
         <order-by>
@@ -251,13 +251,13 @@
                     <binary-operation-expression start-index="129" stop-index="161">
                         <left>
                             <column name="department_id" start-index="129" stop-index="143">
-                                <owner name="d" start-index="129" stop-index="129"/>
+                                <owner name="d" start-index="129" stop-index="129" />
                             </column>
                         </left>
                         <operator>=</operator>
                         <right>
                             <column name="department_id" start-index="147" stop-index="161">
-                                <owner name="e" start-index="147" stop-index="147"/>
+                                <owner name="e" start-index="147" stop-index="147" />
                             </column>
                         </right>
                     </binary-operation-expression>
@@ -266,13 +266,13 @@
         </from>
         <projections start-index="7" stop-index="77">
             <column-projection name="department_id" alias="d_dept_id" start-index="7" stop-index="34">
-                <owner name="d" start-index="7" stop-index="7"/>
+                <owner name="d" start-index="7" stop-index="7" />
             </column-projection>
             <column-projection name="department_id" alias="e_dept_id" start-index="37" stop-index="64">
-                <owner name="e" start-index="37" stop-index="37"/>
+                <owner name="e" start-index="37" stop-index="37" />
             </column-projection>
             <column-projection name="last_name" start-index="67" stop-index="77">
-                <owner name="e" start-index="67" stop-index="67"/>
+                <owner name="e" start-index="67" stop-index="67" />
             </column-projection>
         </projections>
         <order-by>
@@ -298,9 +298,9 @@
             </join-table>
         </from>
         <projections start-index="7" stop-index="47">
-            <column-projection name="department_id" alias="d_e_dept_id" start-index="7" stop-index="34"/>
+            <column-projection name="department_id" alias="d_e_dept_id" start-index="7" stop-index="34" />
             <column-projection name="last_name" start-index="37" stop-index="47">
-                <owner name="e" start-index="37" stop-index="37"/>
+                <owner name="e" start-index="37" stop-index="37" />
             </column-projection>
         </projections>
         <order-by>
@@ -322,10 +322,10 @@
                         <subquery>
                             <select>
                                 <projections start-index="92" stop-index="92">
-                                    <shorthand-projection start-index="92" stop-index="92"/>
+                                    <shorthand-projection start-index="92" stop-index="92" />
                                 </projections>
                                 <from>
-                                    <simple-table name="employees" alias="e" start-index="99" stop-index="109"/>
+                                    <simple-table name="employees" alias="e" start-index="99" stop-index="109" />
                                 </from>
                                 <where start-index="111" stop-index="149">
                                     <expr>
@@ -352,13 +352,13 @@
         </from>
         <projections start-index="7" stop-index="51">
             <column-projection name="department_name" start-index="7" stop-index="23">
-                <owner name="d" start-index="7" stop-index="7"/>
+                <owner name="d" start-index="7" stop-index="7" />
             </column-projection>
             <column-projection name="employee_id" start-index="26" stop-index="38">
-                <owner name="v" start-index="26" stop-index="26"/>
+                <owner name="v" start-index="26" stop-index="26" />
             </column-projection>
             <column-projection name="last_name" start-index="41" stop-index="51">
-                <owner name="v" start-index="41" stop-index="41"/>
+                <owner name="v" start-index="41" stop-index="41" />
             </column-projection>
         </projections>
         <where start-index="154" stop-index="227">
diff --git a/test/parser/src/main/resources/case/dml/select-lock.xml b/test/parser/src/main/resources/case/dml/select-lock.xml
index 25f0dc4181d..7b533677930 100644
--- a/test/parser/src/main/resources/case/dml/select-lock.xml
+++ b/test/parser/src/main/resources/case/dml/select-lock.xml
@@ -33,12 +33,12 @@
             </expr>
         </where>
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
-        <lock start-index="41" stop-index="58"/>
+        <lock start-index="41" stop-index="58" />
     </select>
 
     <select sql-case-id="select_lock_with_for_update" parameters="1">
@@ -57,12 +57,12 @@
             </expr>
         </where>
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
-        <lock start-index="41" stop-index="50"/>
+        <lock start-index="41" stop-index="50" />
     </select>
 
     <select sql-case-id="select_lock_with_for_share" parameters="1">
@@ -81,12 +81,12 @@
             </expr>
         </where>
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
-        <lock start-index="41" stop-index="49"/>
+        <lock start-index="41" stop-index="49" />
     </select>
 
     <select sql-case-id="select_lock_with_nowait" parameters="1">
@@ -105,12 +105,12 @@
             </expr>
         </where>
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
-        <lock start-index="41" stop-index="57"/>
+        <lock start-index="41" stop-index="57" />
     </select>
 
     <select sql-case-id="select_lock_with_skip_locked" parameters="1">
@@ -129,12 +129,12 @@
             </expr>
         </where>
         <from start-index="14" stop-index="20">
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
-        <lock start-index="41" stop-index="62"/>
+        <lock start-index="41" stop-index="62" />
     </select>
 
     <select sql-case-id="select_lock_with_of" parameters="1">
@@ -177,19 +177,19 @@
         <from start-index="14" stop-index="34">
             <join-table start-index="14" stop-index="34" join-type="COMMA">
                 <left start-index="14" stop-index="20">
-                    <simple-table name="t_order" start-index="14" stop-index="20"/>
+                    <simple-table name="t_order" start-index="14" stop-index="20" />
                 </left>
                 <right start-index="23" stop-index="34">
-                    <simple-table name="t_order_item" start-index="23" stop-index="34"/>
+                    <simple-table name="t_order_item" start-index="23" stop-index="34" />
                 </right>
             </join-table>
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <lock start-index="108" stop-index="154">
-            <table name="t_order" start-index="122" stop-index="128"/>
-            <table name="t_order_item" start-index="143" stop-index="154"/>
+            <table name="t_order" start-index="122" stop-index="128" />
+            <table name="t_order_item" start-index="143" stop-index="154" />
         </lock>
     </select>
 
@@ -255,50 +255,50 @@
                 <left start-index="14" stop-index="34">
                     <join-table start-index="14" stop-index="34" join-type="COMMA">
                         <left start-index="14" stop-index="20">
-                            <simple-table name="t_order" start-index="14" stop-index="20"/>
+                            <simple-table name="t_order" start-index="14" stop-index="20" />
                         </left>
                         <right start-index="23" stop-index="34">
-                            <simple-table name="t_order_item" start-index="23" stop-index="34"/>
+                            <simple-table name="t_order_item" start-index="23" stop-index="34" />
                         </right>
                     </join-table>
                 </left>
                 <right start-index="37" stop-index="42">
-                    <simple-table name="t_user" start-index="37" stop-index="42"/>
+                    <simple-table name="t_user" start-index="37" stop-index="42" />
                 </right>
             </join-table>
         </from>
         <projections distinct-row="false" start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <lock start-index="153" stop-index="207">
-            <table name="t_order" start-index="167" stop-index="173"/>
-            <table name="t_order_item" start-index="176" stop-index="187"/>
-            <table name="t_user" start-index="202" stop-index="207"/>
+            <table name="t_order" start-index="167" stop-index="173" />
+            <table name="t_order_item" start-index="176" stop-index="187" />
+            <table name="t_user" start-index="202" stop-index="207" />
         </lock>
     </select>
 
     <select sql-case-id="select_lock_with_for_update_column">
         <projections start-index="7" stop-index="14">
-            <column-projection name="order_id" start-index="7" stop-index="14"/>
+            <column-projection name="order_id" start-index="7" stop-index="14" />
         </projections>
         <from start-index="21" stop-index="27">
-            <simple-table name="t_order" start-index="21" stop-index="27"/>
+            <simple-table name="t_order" start-index="21" stop-index="27" />
         </from>
         <lock start-index="29" stop-index="50" >
-            <column name="order_id" start-index="43" stop-index="50"/>
+            <column name="order_id" start-index="43" stop-index="50" />
         </lock>
     </select>
     
     <select sql-case-id="select_lock_with_for_update_table_column">
         <projections start-index="7" stop-index="14">
-            <column-projection name="order_id" start-index="7" stop-index="14"/>
+            <column-projection name="order_id" start-index="7" stop-index="14" />
         </projections>
         <from start-index="21" stop-index="27">
-            <simple-table name="t_order" start-index="21" stop-index="27"/>
+            <simple-table name="t_order" start-index="21" stop-index="27" />
         </from>
         <lock start-index="29" stop-index="58" >
-            <table name="t_order" start-index="43" stop-index="49"/>
-            <column name="order_id" start-index="51" stop-index="58"/>
+            <table name="t_order" start-index="43" stop-index="49" />
+            <column name="order_id" start-index="51" stop-index="58" />
         </lock>
     </select>
 </sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/case/dml/select-order-by.xml b/test/parser/src/main/resources/case/dml/select-order-by.xml
index f5a2b84e8e8..227090baf6b 100644
--- a/test/parser/src/main/resources/case/dml/select-order-by.xml
+++ b/test/parser/src/main/resources/case/dml/select-order-by.xml
@@ -377,7 +377,7 @@
 
     <select sql-case-id="select_order_by_expression_binary_operation">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <simple-table name="t_order" start-index="14" stop-index="20" />
@@ -387,10 +387,10 @@
                 <expr>
                     <binary-operation-expression start-index="31" stop-index="33">
                         <left>
-                            <literal-expression value="1" start-index="31" stop-index="31"/>
+                            <literal-expression value="1" start-index="31" stop-index="31" />
                         </left>
                         <right>
-                            <literal-expression value="1" start-index="33" stop-index="33"/>
+                            <literal-expression value="1" start-index="33" stop-index="33" />
                         </right>
                         <operator>+</operator>
                     </binary-operation-expression>
diff --git a/test/parser/src/main/resources/case/dml/select-pagination-group-by-order-by.xml b/test/parser/src/main/resources/case/dml/select-pagination-group-by-order-by.xml
index 4566e2a2303..85e0359615f 100644
--- a/test/parser/src/main/resources/case/dml/select-pagination-group-by-order-by.xml
+++ b/test/parser/src/main/resources/case/dml/select-pagination-group-by-order-by.xml
@@ -20,10 +20,10 @@
         <from>
             <join-table join-type="INNER">
                 <left>
-                    <simple-table name="t_order" alias="o" start-index="22" stop-index="30"/>
+                    <simple-table name="t_order" alias="o" start-index="22" stop-index="30" />
                 </left>
                 <right>
-                    <simple-table name="t_order_item" alias="i" start-index="37" stop-index="50"/>
+                    <simple-table name="t_order_item" alias="i" start-index="37" stop-index="50" />
                 </right>
                 <on-condition>
                     <binary-operation-expression start-index="55" stop-index="103">
@@ -64,7 +64,7 @@
         </from>
         <projections start-index="7" stop-index="15">
             <column-projection name="user_id" start-index="7" stop-index="15">
-                <owner name="i" start-index="7" stop-index="7"/>
+                <owner name="i" start-index="7" stop-index="7" />
             </column-projection>
         </projections>
         <where start-index="105" stop-index="160" literal-stop-index="161">
@@ -75,18 +75,18 @@
                             <not>false</not>
                             <left>
                                 <column name="user_id" start-index="111" stop-index="119">
-                                    <owner name="o" start-index="111" stop-index="111"/>
+                                    <owner name="o" start-index="111" stop-index="111" />
                                 </column>
                             </left>
                             <right>
                                 <list-expression start-index="124" stop-index="129">
                                     <items>
-                                        <literal-expression value="1" start-index="125" stop-index="125"/>
-                                        <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125"/>
+                                        <literal-expression value="1" start-index="125" stop-index="125" />
+                                        <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125" />
                                     </items>
                                     <items>
-                                        <literal-expression value="2" start-index="128" stop-index="128"/>
-                                        <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128"/>
+                                        <literal-expression value="2" start-index="128" stop-index="128" />
+                                        <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128" />
                                     </items>
                                 </list-expression>
                             </right>
@@ -98,16 +98,16 @@
                             <not>false</not>
                             <left>
                                 <column name="order_id" start-index="135" stop-index="144">
-                                    <owner name="o" start-index="135" stop-index="135"/>
+                                    <owner name="o" start-index="135" stop-index="135" />
                                 </column>
                             </left>
                             <between-expr>
-                                <literal-expression value="9" start-index="154" stop-index="154"/>
-                                <parameter-marker-expression parameter-index="2" start-index="154" stop-index="154"/>
+                                <literal-expression value="9" start-index="154" stop-index="154" />
+                                <parameter-marker-expression parameter-index="2" start-index="154" stop-index="154" />
                             </between-expr>
                             <and-expr>
-                                <literal-expression value="10" start-index="160" stop-index="161"/>
-                                <parameter-marker-expression parameter-index="3" start-index="160" stop-index="160"/>
+                                <literal-expression value="10" start-index="160" stop-index="161" />
+                                <parameter-marker-expression parameter-index="3" start-index="160" stop-index="160" />
                             </and-expr>
                         </between-expression>
                     </right>
@@ -116,17 +116,17 @@
         </where>
         <group-by>
             <column-item name="item_id" start-index="171" stop-index="179" literal-start-index="172" literal-stop-index="180">
-                <owner name="i" start-index="171" stop-index="171" literal-start-index="172" literal-stop-index="172"/>
+                <owner name="i" start-index="171" stop-index="171" literal-start-index="172" literal-stop-index="172" />
             </column-item>
         </group-by>
         <order-by>
             <column-item name="item_id" order-direction="DESC" nulls-order-type="LAST" start-index="190" stop-index="198" literal-start-index="191" literal-stop-index="199">
-                <owner name="i" start-index="190" stop-index="190" literal-start-index="191" literal-stop-index="191"/>
+                <owner name="i" start-index="190" stop-index="190" literal-start-index="191" literal-stop-index="191" />
             </column-item>
         </order-by>
         <limit start-index="205" stop-index="214" literal-start-index="206" literal-stop-index="215">
-            <offset value="5" parameter-index="4" start-index="211" stop-index="211" literal-start-index="212" literal-stop-index="212"/>
-            <row-count value="3" parameter-index="5" start-index="214" stop-index="214" literal-start-index="215" literal-stop-index="215"/>
+            <offset value="5" parameter-index="4" start-index="211" stop-index="211" literal-start-index="212" literal-stop-index="212" />
+            <row-count value="3" parameter-index="5" start-index="214" stop-index="214" literal-start-index="215" literal-stop-index="215" />
         </limit>
     </select>
 
@@ -134,10 +134,10 @@
         <from>
             <join-table join-type="INNER">
                 <left>
-                    <simple-table name="t_order" alias="o" start-index="22" stop-index="30"/>
+                    <simple-table name="t_order" alias="o" start-index="22" stop-index="30" />
                 </left>
                 <right>
-                    <simple-table name="t_order_item" alias="i" start-index="37" stop-index="50"/>
+                    <simple-table name="t_order_item" alias="i" start-index="37" stop-index="50" />
                 </right>
                 <on-condition>
                     <binary-operation-expression start-index="55" stop-index="103">
@@ -178,7 +178,7 @@
         </from>
         <projections start-index="7" stop-index="15">
             <column-projection name="user_id" start-index="7" stop-index="15">
-                <owner name="i" start-index="7" stop-index="7"/>
+                <owner name="i" start-index="7" stop-index="7" />
             </column-projection>
         </projections>
         <where start-index="105" stop-index="160" literal-stop-index="161">
@@ -189,18 +189,18 @@
                             <not>false</not>
                             <left>
                                 <column name="user_id" start-index="111" stop-index="119">
-                                    <owner name="o" start-index="111" stop-index="111"/>
+                                    <owner name="o" start-index="111" stop-index="111" />
                                 </column>
                             </left>
                             <right>
                                 <list-expression start-index="124" stop-index="129">
                                     <items>
-                                        <literal-expression value="1" start-index="125" stop-index="125"/>
-                                        <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125"/>
+                                        <literal-expression value="1" start-index="125" stop-index="125" />
+                                        <parameter-marker-expression parameter-index="0" start-index="125" stop-index="125" />
                                     </items>
                                     <items>
-                                        <literal-expression value="2" start-index="128" stop-index="128"/>
-                                        <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128"/>
+                                        <literal-expression value="2" start-index="128" stop-index="128" />
+                                        <parameter-marker-expression parameter-index="1" start-index="128" stop-index="128" />
                                     </items>
                                 </list-expression>
                             </right>
@@ -212,16 +212,16 @@
                             <not>false</not>
                             <left>
                                 <column name="order_id" start-index="135" stop-index="144">
-                                    <owner name="o" start-index="135" stop-index="135"/>
+                                    <owner name="o" start-index="135" stop-index="135" />
                                 </column>
                             </left>
                             <between-expr>
-                                <literal-expression value="9" start-index="154" stop-index="154"/>
-                                <parameter-marker-expression parameter-index="2" start-index="154" stop-index="154"/>
+                                <literal-expression value="9" start-index="154" stop-index="154" />
+                                <parameter-marker-expression parameter-index="2" start-index="154" stop-index="154" />
                             </between-expr>
                             <and-expr>
-                                <literal-expression value="10" start-index="160" stop-index="161"/>
-                                <parameter-marker-expression parameter-index="3" start-index="160" stop-index="160"/>
+                                <literal-expression value="10" start-index="160" stop-index="161" />
+                                <parameter-marker-expression parameter-index="3" start-index="160" stop-index="160" />
                             </and-expr>
                         </between-expression>
                     </right>
@@ -230,23 +230,23 @@
         </where>
         <group-by>
             <column-item name="user_id" start-index="171" stop-index="179" literal-start-index="172" literal-stop-index="180">
-                <owner name="i" start-index="171" stop-index="171" literal-start-index="172" literal-stop-index="172"/>
+                <owner name="i" start-index="171" stop-index="171" literal-start-index="172" literal-stop-index="172" />
             </column-item>
         </group-by>
         <order-by>
             <column-item name="item_id" order-direction="DESC" nulls-order-type="LAST" start-index="190" stop-index="198" literal-start-index="191" literal-stop-index="199">
-                <owner name="i" start-index="190" stop-index="190" literal-start-index="191" literal-stop-index="191"/>
+                <owner name="i" start-index="190" stop-index="190" literal-start-index="191" literal-stop-index="191" />
             </column-item>
         </order-by>
         <limit start-index="205" stop-index="214" literal-start-index="206" literal-stop-index="215">
-            <offset value="5" parameter-index="4" start-index="211" stop-index="211" literal-start-index="212" literal-stop-index="212"/>
-            <row-count value="3" parameter-index="5" start-index="214" stop-index="214" literal-start-index="215" literal-stop-index="215"/>
+            <offset value="5" parameter-index="4" start-index="211" stop-index="211" literal-start-index="212" literal-stop-index="212" />
+            <row-count value="3" parameter-index="5" start-index="214" stop-index="214" literal-start-index="215" literal-stop-index="215" />
         </limit>
     </select>
 
     <select sql-case-id="select_pagination_with_top_and_group_by_and_order_by" parameters="3, 1, 2, 9, 10, 6">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table alias="row_">
@@ -254,28 +254,28 @@
                     <select>
                         <projections start-index="22" stop-index="158">
                             <top-projection alias="rownum_" start-index="22" stop-index="70">
-                                <top-value value="3" parameter-index="0" start-index="26" stop-index="26"/>
+                                <top-value value="3" parameter-index="0" start-index="26" stop-index="26" />
                             </top-projection>
                             <column-projection name="item_id" start-index="84" stop-index="92">
-                                <owner name="i" start-index="84" stop-index="84"/>
+                                <owner name="i" start-index="84" stop-index="84" />
                             </column-projection>
                             <column-projection name="order_id" alias="order_id" start-index="95" stop-index="116">
-                                <owner name="o" start-index="95" stop-index="95"/>
+                                <owner name="o" start-index="95" stop-index="95" />
                             </column-projection>
                             <column-projection name="status" alias="status" start-index="119" stop-index="136">
-                                <owner name="o" start-index="119" stop-index="119"/>
+                                <owner name="o" start-index="119" stop-index="119" />
                             </column-projection>
                             <column-projection name="user_id" alias="user_id" start-index="139" stop-index="158">
-                                <owner name="o" start-index="139" stop-index="139"/>
+                                <owner name="o" start-index="139" stop-index="139" />
                             </column-projection>
                         </projections>
                         <from>
                             <join-table join-type="INNER">
                                 <left>
-                                    <simple-table start-index="165" stop-index="173" name="t_order" alias="o"/>
+                                    <simple-table start-index="165" stop-index="173" name="t_order" alias="o" />
                                 </left>
                                 <right>
-                                    <simple-table start-index="180" stop-index="193" name="t_order_item" alias="i"/>
+                                    <simple-table start-index="180" stop-index="193" name="t_order_item" alias="i" />
                                 </right>
                                 <on-condition>
                                     <binary-operation-expression start-index="198" stop-index="246">
@@ -363,7 +363,7 @@
                         </where>
                         <group-by>
                             <column-item name="item_id" start-index="314" stop-index="322" literal-start-index="315" literal-stop-index="323">
-                                <owner name="i" start-index="314" stop-index="314" literal-start-index="315" literal-stop-index="315"/>
+                                <owner name="i" start-index="314" stop-index="314" literal-start-index="315" literal-stop-index="315" />
                             </column-item>
                         </group-by>
                     </select>
@@ -390,7 +390,7 @@
 
     <select sql-case-id="select_pagination_with_top_percent_with_ties_and_group_by_and_order_by" parameters="3, 1, 2, 9, 10, 6">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table alias="row_">
@@ -398,28 +398,28 @@
                     <select>
                         <projections start-index="22" stop-index="176">
                             <top-projection alias="rownum_" start-index="22" stop-index="88">
-                                <top-value value="3" parameter-index="0" start-index="26" stop-index="26"/>
+                                <top-value value="3" parameter-index="0" start-index="26" stop-index="26" />
                             </top-projection>
                             <column-projection name="item_id" start-index="102" stop-index="110">
-                                <owner name="i" start-index="102" stop-index="102"/>
+                                <owner name="i" start-index="102" stop-index="102" />
                             </column-projection>
                             <column-projection name="order_id" alias="order_id" start-index="113" stop-index="134">
-                                <owner name="o" start-index="113" stop-index="113"/>
+                                <owner name="o" start-index="113" stop-index="113" />
                             </column-projection>
                             <column-projection name="status" alias="status" start-index="137" stop-index="154">
-                                <owner name="o" start-index="137" stop-index="137"/>
+                                <owner name="o" start-index="137" stop-index="137" />
                             </column-projection>
                             <column-projection name="user_id" alias="user_id" start-index="157" stop-index="176">
-                                <owner name="o" start-index="157" stop-index="157"/>
+                                <owner name="o" start-index="157" stop-index="157" />
                             </column-projection>
                         </projections>
                         <from>
                             <join-table join-type="INNER">
                                 <left>
-                                    <simple-table start-index="183" stop-index="191" name="t_order" alias="o"/>
+                                    <simple-table start-index="183" stop-index="191" name="t_order" alias="o" />
                                 </left>
                                 <right>
-                                    <simple-table start-index="198" stop-index="211" name="t_order_item" alias="i"/>
+                                    <simple-table start-index="198" stop-index="211" name="t_order_item" alias="i" />
                                 </right>
                                 <on-condition>
                                     <binary-operation-expression start-index="216" stop-index="264">
@@ -507,7 +507,7 @@
                         </where>
                         <group-by>
                             <column-item name="item_id" start-index="332" stop-index="340" literal-start-index="333" literal-stop-index="341">
-                                <owner name="i" start-index="332" stop-index="332" literal-start-index="333" literal-stop-index="333"/>
+                                <owner name="i" start-index="332" stop-index="332" literal-start-index="333" literal-stop-index="333" />
                             </column-item>
                         </group-by>
                     </select>
@@ -534,7 +534,7 @@
 
     <select sql-case-id="select_pagination_with_top_and_group_by_and_order_by_and_parentheses" parameters="3, 1, 2, 9, 10, 6">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table alias="row_">
@@ -542,28 +542,28 @@
                     <select>
                         <projections start-index="22" stop-index="160">
                             <top-projection alias="rownum_" start-index="22" stop-index="72">
-                                <top-value value="3" parameter-index="0" start-index="27" stop-index="27"/>
+                                <top-value value="3" parameter-index="0" start-index="27" stop-index="27" />
                             </top-projection>
                             <column-projection name="item_id" start-index="86" stop-index="94">
-                                <owner name="i" start-index="86" stop-index="86"/>
+                                <owner name="i" start-index="86" stop-index="86" />
                             </column-projection>
                             <column-projection name="order_id" alias="order_id" start-index="97" stop-index="118">
-                                <owner name="o" start-index="97" stop-index="97"/>
+                                <owner name="o" start-index="97" stop-index="97" />
                             </column-projection>
                             <column-projection name="status" alias="status" start-index="121" stop-index="138">
-                                <owner name="o" start-index="121" stop-index="121"/>
+                                <owner name="o" start-index="121" stop-index="121" />
                             </column-projection>
                             <column-projection name="user_id" alias="user_id" start-index="141" stop-index="160">
-                                <owner name="o" start-index="141" stop-index="141"/>
+                                <owner name="o" start-index="141" stop-index="141" />
                             </column-projection>
                         </projections>
                         <from>
                             <join-table join-type="INNER">
                                 <left>
-                                    <simple-table start-index="167" stop-index="175" name="t_order" alias="o"/>
+                                    <simple-table start-index="167" stop-index="175" name="t_order" alias="o" />
                                 </left>
                                 <right>
-                                    <simple-table start-index="182" stop-index="195" name="t_order_item" alias="i"/>
+                                    <simple-table start-index="182" stop-index="195" name="t_order_item" alias="i" />
                                 </right>
                                 <on-condition>
                                     <binary-operation-expression start-index="200" stop-index="248">
@@ -651,7 +651,7 @@
                         </where>
                         <group-by>
                             <column-item name="item_id" start-index="316" stop-index="324" literal-start-index="317" literal-stop-index="325">
-                                <owner name="i" start-index="316" stop-index="316" literal-start-index="317" literal-stop-index="317"/>
+                                <owner name="i" start-index="316" stop-index="316" literal-start-index="317" literal-stop-index="317" />
                             </column-item>
                         </group-by>
                     </select>
@@ -678,7 +678,7 @@
 
     <select sql-case-id="select_pagination_with_top_percent_with_ties_and_group_by_and_order_by_and_parentheses" parameters="3, 1, 2, 9, 10, 6">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table alias="row_">
@@ -686,28 +686,28 @@
                     <select>
                         <projections start-index="22" stop-index="178">
                             <top-projection alias="rownum_" start-index="22" stop-index="90">
-                                <top-value value="3" parameter-index="0" start-index="27" stop-index="27"/>
+                                <top-value value="3" parameter-index="0" start-index="27" stop-index="27" />
                             </top-projection>
                             <column-projection name="item_id" start-index="104" stop-index="112">
-                                <owner name="i" start-index="104" stop-index="104"/>
+                                <owner name="i" start-index="104" stop-index="104" />
                             </column-projection>
                             <column-projection name="order_id" alias="order_id" start-index="115" stop-index="136">
-                                <owner name="o" start-index="115" stop-index="115"/>
+                                <owner name="o" start-index="115" stop-index="115" />
                             </column-projection>
                             <column-projection name="status" alias="status" start-index="139" stop-index="156">
-                                <owner name="o" start-index="139" stop-index="139"/>
+                                <owner name="o" start-index="139" stop-index="139" />
                             </column-projection>
                             <column-projection name="user_id" alias="user_id" start-index="159" stop-index="178">
-                                <owner name="o" start-index="159" stop-index="159"/>
+                                <owner name="o" start-index="159" stop-index="159" />
                             </column-projection>
                         </projections>
                         <from>
                             <join-table join-type="INNER">
                                 <left>
-                                    <simple-table start-index="185" stop-index="193" name="t_order" alias="o"/>
+                                    <simple-table start-index="185" stop-index="193" name="t_order" alias="o" />
                                 </left>
                                 <right>
-                                    <simple-table start-index="200" stop-index="213" name="t_order_item" alias="i"/>
+                                    <simple-table start-index="200" stop-index="213" name="t_order_item" alias="i" />
                                 </right>
                                 <on-condition>
                                     <binary-operation-expression start-index="218" stop-index="266">
@@ -795,7 +795,7 @@
                         </where>
                         <group-by>
                             <column-item name="item_id" start-index="334" stop-index="342" literal-start-index="335" literal-stop-index="343">
-                                <owner name="i" start-index="334" stop-index="334" literal-start-index="335" literal-stop-index="335"/>
+                                <owner name="i" start-index="334" stop-index="334" literal-start-index="335" literal-stop-index="335" />
                             </column-item>
                         </group-by>
                     </select>
@@ -822,7 +822,7 @@
 
     <select sql-case-id="select_pagination_with_top_and_diff_group_by_and_order_by" parameters="3, 1, 2, 9, 10, 6">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table alias="row_">
@@ -830,28 +830,28 @@
                     <select>
                         <projections start-index="22" stop-index="158">
                             <top-projection alias="rownum_" start-index="22" stop-index="70">
-                                <top-value value="3" parameter-index="0" start-index="26" stop-index="26"/>
+                                <top-value value="3" parameter-index="0" start-index="26" stop-index="26" />
                             </top-projection>
                             <column-projection name="item_id" start-index="84" stop-index="92">
-                                <owner name="i" start-index="84" stop-index="84"/>
+                                <owner name="i" start-index="84" stop-index="84" />
                             </column-projection>
                             <column-projection name="order_id" alias="order_id" start-index="95" stop-index="116">
-                                <owner name="o" start-index="95" stop-index="95"/>
+                                <owner name="o" start-index="95" stop-index="95" />
                             </column-projection>
                             <column-projection name="status" alias="status" start-index="119" stop-index="136">
-                                <owner name="o" start-index="119" stop-index="119"/>
+                                <owner name="o" start-index="119" stop-index="119" />
                             </column-projection>
                             <column-projection name="user_id" alias="user_id" start-index="139" stop-index="158">
-                                <owner name="o" start-index="139" stop-index="139"/>
+                                <owner name="o" start-index="139" stop-index="139" />
                             </column-projection>
                         </projections>
                         <from>
                             <join-table join-type="INNER">
                                 <left>
-                                    <simple-table start-index="165" stop-index="173" name="t_order" alias="o"/>
+                                    <simple-table start-index="165" stop-index="173" name="t_order" alias="o" />
                                 </left>
                                 <right>
-                                    <simple-table start-index="180" stop-index="193" name="t_order_item" alias="i"/>
+                                    <simple-table start-index="180" stop-index="193" name="t_order_item" alias="i" />
                                 </right>
                                 <on-condition>
                                     <binary-operation-expression start-index="198" stop-index="246">
@@ -939,7 +939,7 @@
                         </where>
                         <group-by>
                             <column-item name="user_id" start-index="314" stop-index="322" literal-start-index="315" literal-stop-index="323">
-                                <owner name="i" start-index="314" stop-index="314" literal-start-index="315" literal-stop-index="315"/>
+                                <owner name="i" start-index="314" stop-index="314" literal-start-index="315" literal-stop-index="315" />
                             </column-item>
                         </group-by>
                     </select>
@@ -966,7 +966,7 @@
 
     <select sql-case-id="select_pagination_with_top_percent_with_ties_and_diff_group_by_and_order_by" parameters="3, 1, 2, 9, 10, 6">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table alias="row_">
@@ -974,28 +974,28 @@
                     <select>
                         <projections start-index="22" stop-index="176">
                             <top-projection alias="rownum_" start-index="22" stop-index="88">
-                                <top-value value="3" parameter-index="0" start-index="26" stop-index="26"/>
+                                <top-value value="3" parameter-index="0" start-index="26" stop-index="26" />
                             </top-projection>
                             <column-projection name="item_id" start-index="102" stop-index="110">
-                                <owner name="i" start-index="102" stop-index="102"/>
+                                <owner name="i" start-index="102" stop-index="102" />
                             </column-projection>
                             <column-projection name="order_id" alias="order_id" start-index="113" stop-index="134">
-                                <owner name="o" start-index="113" stop-index="113"/>
+                                <owner name="o" start-index="113" stop-index="113" />
                             </column-projection>
                             <column-projection name="status" alias="status" start-index="137" stop-index="154">
-                                <owner name="o" start-index="137" stop-index="137"/>
+                                <owner name="o" start-index="137" stop-index="137" />
                             </column-projection>
                             <column-projection name="user_id" alias="user_id" start-index="157" stop-index="176">
-                                <owner name="o" start-index="157" stop-index="157"/>
+                                <owner name="o" start-index="157" stop-index="157" />
                             </column-projection>
                         </projections>
                         <from>
                             <join-table join-type="INNER">
                                 <left>
-                                    <simple-table start-index="183" stop-index="191" name="t_order" alias="o"/>
+                                    <simple-table start-index="183" stop-index="191" name="t_order" alias="o" />
                                 </left>
                                 <right>
-                                    <simple-table start-index="198" stop-index="211" name="t_order_item" alias="i"/>
+                                    <simple-table start-index="198" stop-index="211" name="t_order_item" alias="i" />
                                 </right>
                                 <on-condition>
                                     <binary-operation-expression start-index="216" stop-index="264">
@@ -1083,7 +1083,7 @@
                         </where>
                         <group-by>
                             <column-item name="user_id" start-index="332" stop-index="340" literal-start-index="333" literal-stop-index="341">
-                                <owner name="i" start-index="332" stop-index="332" literal-start-index="333" literal-stop-index="333"/>
+                                <owner name="i" start-index="332" stop-index="332" literal-start-index="333" literal-stop-index="333" />
                             </column-item>
                         </group-by>
                     </select>
@@ -1110,7 +1110,7 @@
 
     <select sql-case-id="select_pagination_with_top_and_diff_group_by_and_order_by_and_parentheses" parameters="3, 1, 2, 9, 10, 6">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table alias="row_">
@@ -1118,28 +1118,28 @@
                     <select>
                         <projections start-index="22" stop-index="160">
                             <top-projection alias="rownum_" start-index="22" stop-index="72">
-                                <top-value value="3" parameter-index="0" start-index="27" stop-index="27"/>
+                                <top-value value="3" parameter-index="0" start-index="27" stop-index="27" />
                             </top-projection>
                             <column-projection name="item_id" start-index="86" stop-index="94">
-                                <owner name="i" start-index="86" stop-index="86"/>
+                                <owner name="i" start-index="86" stop-index="86" />
                             </column-projection>
                             <column-projection name="order_id" alias="order_id" start-index="97" stop-index="118">
-                                <owner name="o" start-index="97" stop-index="97"/>
+                                <owner name="o" start-index="97" stop-index="97" />
                             </column-projection>
                             <column-projection name="status" alias="status" start-index="121" stop-index="138">
-                                <owner name="o" start-index="121" stop-index="121"/>
+                                <owner name="o" start-index="121" stop-index="121" />
                             </column-projection>
                             <column-projection name="user_id" alias="user_id" start-index="141" stop-index="160">
-                                <owner name="o" start-index="141" stop-index="141"/>
+                                <owner name="o" start-index="141" stop-index="141" />
                             </column-projection>
                         </projections>
                         <from>
                             <join-table join-type="INNER">
                                 <left>
-                                    <simple-table start-index="167" stop-index="175" name="t_order" alias="o"/>
+                                    <simple-table start-index="167" stop-index="175" name="t_order" alias="o" />
                                 </left>
                                 <right>
-                                    <simple-table start-index="182" stop-index="195" name="t_order_item" alias="i"/>
+                                    <simple-table start-index="182" stop-index="195" name="t_order_item" alias="i" />
                                 </right>
                                 <on-condition>
                                     <binary-operation-expression start-index="200" stop-index="248">
@@ -1227,7 +1227,7 @@
                         </where>
                         <group-by>
                             <column-item name="user_id" start-index="316" stop-index="324" literal-start-index="317" literal-stop-index="325">
-                                <owner name="i" start-index="316" stop-index="316" literal-start-index="317" literal-stop-index="317"/>
+                                <owner name="i" start-index="316" stop-index="316" literal-start-index="317" literal-stop-index="317" />
                             </column-item>
                         </group-by>
                     </select>
@@ -1254,7 +1254,7 @@
 
     <select sql-case-id="select_pagination_with_top_percent_with_ties_and_diff_group_by_and_order_by_and_parentheses" parameters="3, 1, 2, 9, 10, 6">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table alias="row_">
@@ -1262,28 +1262,28 @@
                     <select>
                         <projections start-index="22" stop-index="178">
                             <top-projection alias="rownum_" start-index="22" stop-index="90">
-                                <top-value value="3" parameter-index="0" start-index="27" stop-index="27"/>
+                                <top-value value="3" parameter-index="0" start-index="27" stop-index="27" />
                             </top-projection>
                             <column-projection name="item_id" start-index="104" stop-index="112">
-                                <owner name="i" start-index="104" stop-index="104"/>
+                                <owner name="i" start-index="104" stop-index="104" />
                             </column-projection>
                             <column-projection name="order_id" alias="order_id" start-index="115" stop-index="136">
-                                <owner name="o" start-index="115" stop-index="115"/>
+                                <owner name="o" start-index="115" stop-index="115" />
                             </column-projection>
                             <column-projection name="status" alias="status" start-index="139" stop-index="156">
-                                <owner name="o" start-index="139" stop-index="139"/>
+                                <owner name="o" start-index="139" stop-index="139" />
                             </column-projection>
                             <column-projection name="user_id" alias="user_id" start-index="159" stop-index="178">
-                                <owner name="o" start-index="159" stop-index="159"/>
+                                <owner name="o" start-index="159" stop-index="159" />
                             </column-projection>
                         </projections>
                         <from>
                             <join-table join-type="INNER">
                                 <left>
-                                    <simple-table start-index="185" stop-index="193" name="t_order" alias="o"/>
+                                    <simple-table start-index="185" stop-index="193" name="t_order" alias="o" />
                                 </left>
                                 <right>
-                                    <simple-table start-index="200" stop-index="213" name="t_order_item" alias="i"/>
+                                    <simple-table start-index="200" stop-index="213" name="t_order_item" alias="i" />
                                 </right>
                                 <on-condition>
                                     <binary-operation-expression start-index="218" stop-index="266">
@@ -1371,7 +1371,7 @@
                         </where>
                         <group-by>
                             <column-item name="user_id" start-index="334" stop-index="342" literal-start-index="335" literal-stop-index="343">
-                                <owner name="i" start-index="334" stop-index="334" literal-start-index="335" literal-stop-index="335"/>
+                                <owner name="i" start-index="334" stop-index="334" literal-start-index="335" literal-stop-index="335" />
                             </column-item>
                         </group-by>
                     </select>
@@ -1398,7 +1398,7 @@
 
     <select sql-case-id="select_pagination_with_row_number_and_group_by_and_order_by" parameters="1, 2, 9, 7, 5, 3">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table start-index="14" stop-index="382" alias="t">
@@ -1406,9 +1406,9 @@
                     <select>
                         <projections start-index="22" stop-index="43">
                             <shorthand-projection start-index="22" stop-index="27">
-                                <owner start-index="22" stop-index="25" name="row_"/>
+                                <owner start-index="22" stop-index="25" name="row_" />
                             </shorthand-projection>
-                            <column-projection start-index="30" stop-index="43" name="rownum" alias="rownum_"/>
+                            <column-projection start-index="30" stop-index="43" name="rownum" alias="rownum_" />
                         </projections>
                         <from>
                             <subquery-table alias="row_">
@@ -1416,22 +1416,22 @@
                                     <select>
                                         <projections start-index="58" stop-index="139">
                                             <column-projection start-index="58" stop-index="85" name="order_id" alias="order_id">
-                                                <owner start-index="58" stop-index="64" name="order0_"/>
+                                                <owner start-index="58" stop-index="64" name="order0_" />
                                             </column-projection>
                                             <column-projection start-index="88" stop-index="111" name="status" alias="status">
-                                                <owner start-index="88" stop-index="94" name="order0_"/>
+                                                <owner start-index="88" stop-index="94" name="order0_" />
                                             </column-projection>
                                             <column-projection start-index="114" stop-index="139" name="user_id" alias="user_id">
-                                                <owner start-index="114" stop-index="120" name="order0_"/>
+                                                <owner start-index="114" stop-index="120" name="order0_" />
                                             </column-projection>
                                         </projections>
                                         <from>
                                             <join-table join-type="INNER">
                                                 <left>
-                                                    <simple-table start-index="146" stop-index="160" name="t_order" alias="order0_"/>
+                                                    <simple-table start-index="146" stop-index="160" name="t_order" alias="order0_" />
                                                 </left>
                                                 <right>
-                                                    <simple-table start-index="167" stop-index="180" name="t_order_item" alias="i"/>
+                                                    <simple-table start-index="167" stop-index="180" name="t_order_item" alias="i" />
                                                 </right>
                                                 <on-condition>
                                                     <binary-operation-expression start-index="185" stop-index="245">
@@ -1519,12 +1519,12 @@
                                         </where>
                                         <group-by>
                                             <column-item start-index="325" stop-index="333" name="item_id">
-                                                <owner start-index="325" stop-index="325" name="i"/>
+                                                <owner start-index="325" stop-index="325" name="i" />
                                             </column-item>
                                         </group-by>
                                         <order-by>
                                             <column-item start-index="344" stop-index="352" name="item_id" order-direction="DESC" nulls-order-type="LAST">
-                                                <owner start-index="344" stop-index="344" name="i"/>
+                                                <owner start-index="344" stop-index="344" name="i" />
                                             </column-item>
                                         </order-by>
                                     </select>
@@ -1569,7 +1569,7 @@
 
     <select sql-case-id="select_pagination_with_row_number_and_diff_group_by_and_order_by" parameters="1, 2, 9, 7, 5, 3">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table start-index="14" stop-index="382" alias="t">
@@ -1577,9 +1577,9 @@
                     <select>
                         <projections start-index="22" stop-index="43">
                             <shorthand-projection start-index="22" stop-index="27">
-                                <owner start-index="22" stop-index="25" name="row_"/>
+                                <owner start-index="22" stop-index="25" name="row_" />
                             </shorthand-projection>
-                            <column-projection start-index="30" stop-index="43" name="rownum" alias="rownum_"/>
+                            <column-projection start-index="30" stop-index="43" name="rownum" alias="rownum_" />
                         </projections>
                         <from>
                             <subquery-table alias="row_">
@@ -1587,22 +1587,22 @@
                                     <select>
                                         <projections start-index="58" stop-index="139">
                                             <column-projection start-index="58" stop-index="85" name="order_id" alias="order_id">
-                                                <owner start-index="58" stop-index="64" name="order0_"/>
+                                                <owner start-index="58" stop-index="64" name="order0_" />
                                             </column-projection>
                                             <column-projection start-index="88" stop-index="111" name="status" alias="status">
-                                                <owner start-index="88" stop-index="94" name="order0_"/>
+                                                <owner start-index="88" stop-index="94" name="order0_" />
                                             </column-projection>
                                             <column-projection start-index="114" stop-index="139" name="user_id" alias="user_id">
-                                                <owner start-index="114" stop-index="120" name="order0_"/>
+                                                <owner start-index="114" stop-index="120" name="order0_" />
                                             </column-projection>
                                         </projections>
                                         <from>
                                             <join-table join-type="INNER">
                                                 <left>
-                                                    <simple-table start-index="146" stop-index="160" name="t_order" alias="order0_"/>
+                                                    <simple-table start-index="146" stop-index="160" name="t_order" alias="order0_" />
                                                 </left>
                                                 <right>
-                                                    <simple-table start-index="167" stop-index="180" name="t_order_item" alias="i"/>
+                                                    <simple-table start-index="167" stop-index="180" name="t_order_item" alias="i" />
                                                 </right>
                                                 <on-condition>
                                                     <binary-operation-expression start-index="185" stop-index="245">
@@ -1690,12 +1690,12 @@
                                         </where>
                                         <group-by>
                                             <column-item start-index="325" stop-index="333" name="user_id">
-                                                <owner start-index="325" stop-index="325" name="i"/>
+                                                <owner start-index="325" stop-index="325" name="i" />
                                             </column-item>
                                         </group-by>
                                         <order-by>
                                             <column-item start-index="344" stop-index="352" name="item_id" order-direction="DESC" nulls-order-type="LAST">
-                                                <owner start-index="344" stop-index="344" name="i"/>
+                                                <owner start-index="344" stop-index="344" name="i" />
                                             </column-item>
                                         </order-by>
                                     </select>
@@ -1740,7 +1740,7 @@
 
     <select sql-case-id="select_pagination_with_row_number_and_group_by_and_order_by_oracle" parameters="1, 2, 9, 7, 5, 3">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table start-index="14" stop-index="382" alias="tt">
@@ -1748,9 +1748,9 @@
                     <select>
                         <projections start-index="22" stop-index="43">
                             <shorthand-projection start-index="22" stop-index="27">
-                                <owner start-index="22" stop-index="25" name="row_"/>
+                                <owner start-index="22" stop-index="25" name="row_" />
                             </shorthand-projection>
-                            <column-projection start-index="30" stop-index="43" name="rownum" alias="rownum_"/>
+                            <column-projection start-index="30" stop-index="43" name="rownum" alias="rownum_" />
                         </projections>
                         <from>
                             <subquery-table alias="row_">
@@ -1758,22 +1758,22 @@
                                     <select>
                                         <projections start-index="58" stop-index="139">
                                             <column-projection start-index="58" stop-index="85" name="order_id" alias="order_id">
-                                                <owner start-index="58" stop-index="64" name="order0_"/>
+                                                <owner start-index="58" stop-index="64" name="order0_" />
                                             </column-projection>
                                             <column-projection start-index="88" stop-index="111" name="status" alias="status">
-                                                <owner start-index="88" stop-index="94" name="order0_"/>
+                                                <owner start-index="88" stop-index="94" name="order0_" />
                                             </column-projection>
                                             <column-projection start-index="114" stop-index="139" name="user_id" alias="user_id">
-                                                <owner start-index="114" stop-index="120" name="order0_"/>
+                                                <owner start-index="114" stop-index="120" name="order0_" />
                                             </column-projection>
                                         </projections>
                                         <from>
                                             <join-table join-type="INNER">
                                                 <left>
-                                                    <simple-table start-index="146" stop-index="160" name="t_order" alias="order0_"/>
+                                                    <simple-table start-index="146" stop-index="160" name="t_order" alias="order0_" />
                                                 </left>
                                                 <right>
-                                                    <simple-table start-index="167" stop-index="180" name="t_order_item" alias="i"/>
+                                                    <simple-table start-index="167" stop-index="180" name="t_order_item" alias="i" />
                                                 </right>
                                                 <on-condition>
                                                     <binary-operation-expression start-index="185" stop-index="245">
@@ -1861,12 +1861,12 @@
                                         </where>
                                         <group-by>
                                             <column-item start-index="325" stop-index="333" name="item_id" nulls-order-type="LAST">
-                                                <owner start-index="325" stop-index="325" name="i"/>
+                                                <owner start-index="325" stop-index="325" name="i" />
                                             </column-item>
                                         </group-by>
                                         <order-by>
                                             <column-item start-index="344" stop-index="352" name="item_id" order-direction="DESC">
-                                                <owner start-index="344" stop-index="344" name="i"/>
+                                                <owner start-index="344" stop-index="344" name="i" />
                                             </column-item>
                                         </order-by>
                                     </select>
@@ -1911,7 +1911,7 @@
 
     <select sql-case-id="select_pagination_with_row_number_and_diff_group_by_and_order_by_oracle" parameters="1, 2, 9, 7, 5, 3">
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <from>
             <subquery-table start-index="14" stop-index="382" alias="t">
@@ -1919,9 +1919,9 @@
                     <select>
                         <projections start-index="22" stop-index="43">
                             <shorthand-projection start-index="22" stop-index="27">
-                                <owner start-index="22" stop-index="25" name="row_"/>
+                                <owner start-index="22" stop-index="25" name="row_" />
                             </shorthand-projection>
-                            <column-projection start-index="30" stop-index="43" name="rownum" alias="rownum_"/>
+                            <column-projection start-index="30" stop-index="43" name="rownum" alias="rownum_" />
                         </projections>
                         <from>
                             <subquery-table alias="row_">
@@ -1929,22 +1929,22 @@
                                     <select>
                                         <projections start-index="58" stop-index="139">
                                             <column-projection start-index="58" stop-index="85" name="order_id" alias="order_id">
-                                                <owner start-index="58" stop-index="64" name="order0_"/>
+                                                <owner start-index="58" stop-index="64" name="order0_" />
                                             </column-projection>
                                             <column-projection start-index="88" stop-index="111" name="status" alias="status">
-                                                <owner start-index="88" stop-index="94" name="order0_"/>
+                                                <owner start-index="88" stop-index="94" name="order0_" />
                                             </column-projection>
                                             <column-projection start-index="114" stop-index="139" name="user_id" alias="user_id">
-                                                <owner start-index="114" stop-index="120" name="order0_"/>
+                                                <owner start-index="114" stop-index="120" name="order0_" />
                                             </column-projection>
                                         </projections>
                                         <from>
                                             <join-table join-type="INNER">
                                                 <left>
-                                                    <simple-table start-index="146" stop-index="160" name="t_order" alias="order0_"/>
+                                                    <simple-table start-index="146" stop-index="160" name="t_order" alias="order0_" />
                                                 </left>
                                                 <right>
-                                                    <simple-table start-index="167" stop-index="180" name="t_order_item" alias="i"/>
+                                                    <simple-table start-index="167" stop-index="180" name="t_order_item" alias="i" />
                                                 </right>
                                                 <on-condition>
                                                     <binary-operation-expression start-index="185" stop-index="245">
@@ -2032,12 +2032,12 @@
                                         </where>
                                         <group-by>
                                             <column-item start-index="325" stop-index="333" name="user_id" nulls-order-type="LAST">
-                                                <owner start-index="325" stop-index="325" name="i"/>
+                                                <owner start-index="325" stop-index="325" name="i" />
                                             </column-item>
                                         </group-by>
                                         <order-by>
                                             <column-item start-index="344" stop-index="352" name="item_id" order-direction="DESC">
-                                                <owner start-index="344" stop-index="344" name="i"/>
+                                                <owner start-index="344" stop-index="344" name="i" />
                                             </column-item>
                                         </order-by>
                                     </select>
diff --git a/test/parser/src/main/resources/case/dml/select-pagination.xml b/test/parser/src/main/resources/case/dml/select-pagination.xml
index 296c5308f2d..92707d6d985 100644
--- a/test/parser/src/main/resources/case/dml/select-pagination.xml
+++ b/test/parser/src/main/resources/case/dml/select-pagination.xml
@@ -1981,7 +1981,7 @@
 
     <select sql-case-id="select_pagination_with_fetch_first_with_row_number">
         <from>
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections start-index="7" stop-index="7">
             <shorthand-projection start-index="7" stop-index="7" />
@@ -1989,12 +1989,12 @@
         <order-by>
             <column-item name="order_id" start-index="31" stop-index="38" nulls-order-type="LAST" />
         </order-by>
-        <row-count value="5" start-index="52" stop-index="52"/>
+        <row-count value="5" start-index="52" stop-index="52" />
     </select>
     
     <select sql-case-id="select_pagination_with_offset_fetch" parameters="20">
         <from>
-            <simple-table name="t_order" start-index="14" stop-index="20"/>
+            <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections start-index="7" stop-index="7">
             <shorthand-projection start-index="7" stop-index="7" />
@@ -2003,14 +2003,14 @@
             <column-item name="order_id" start-index="31" stop-index="38" />
         </order-by>
         <limit literal-start-index="40" literal-stop-index="75" start-index="40" stop-index="74">
-            <offset value="0" start-index="47" stop-index="47" literal-start-index="47" literal-stop-index="47"/>
-            <row-count value="20" parameter-index="1" literal-start-index="64" literal-stop-index="65" start-index="64" stop-index="64"/>
+            <offset value="0" start-index="47" stop-index="47" literal-start-index="47" literal-stop-index="47" />
+            <row-count value="20" parameter-index="1" literal-start-index="64" literal-stop-index="65" start-index="64" stop-index="64" />
         </limit>
     </select>
 
     <select sql-case-id="select_pagination_with_limit_offset_and_row_count">
         <from>
-            <simple-table name="t_order" start-index="30" stop-index="36"/>
+            <simple-table name="t_order" start-index="30" stop-index="36" />
         </from>
         <projections start-index="7" stop-index="23">
             <column-projection start-index="7" stop-index="14" name="order_id" />
@@ -2024,7 +2024,7 @@
 
     <select sql-case-id="select_pagination_with_limit_row_count">
         <from>
-            <simple-table name="t_order" start-index="30" stop-index="36"/>
+            <simple-table name="t_order" start-index="30" stop-index="36" />
         </from>
         <projections start-index="7" stop-index="23">
             <column-projection start-index="7" stop-index="14" name="order_id" />
diff --git a/test/parser/src/main/resources/case/dml/select-special-function.xml b/test/parser/src/main/resources/case/dml/select-special-function.xml
index d8dcf2d8320..595b7f6c9d9 100644
--- a/test/parser/src/main/resources/case/dml/select-special-function.xml
+++ b/test/parser/src/main/resources/case/dml/select-special-function.xml
@@ -19,7 +19,7 @@
 <sql-parser-test-cases>
     <select sql-case-id="select_group_concat">
         <from>
-            <simple-table name="t_order" start-index="33" stop-index="39"/>
+            <simple-table name="t_order" start-index="33" stop-index="39" />
         </from>
         <projections start-index="7" stop-index="26">
             <expression-projection text="GROUP_CONCAT(status)" start-index="7" stop-index="26">
@@ -35,7 +35,7 @@
     </select>
     <select sql-case-id="select_window_function">
         <from>
-            <simple-table name="t_order" start-index="42" stop-index="48"/>
+            <simple-table name="t_order" start-index="42" stop-index="48" />
         </from>
         <projections start-index="7" stop-index="35">
             <column-projection name="order_id" start-index="7" stop-index="14" />
@@ -52,10 +52,10 @@
                 <expr>
                     <function function-name="CAST" start-index="7" stop-index="27" text="CAST('1' AS UNSIGNED)">
                         <parameter>
-                            <literal-expression value="1" start-index="12" stop-index="14"/>
+                            <literal-expression value="1" start-index="12" stop-index="14" />
                         </parameter>
                         <parameter>
-                            <data-type value="UNSIGNED" start-index="19" stop-index="26"/>
+                            <data-type value="UNSIGNED" start-index="19" stop-index="26" />
                         </parameter>
                     </function>
                 </expr>
@@ -132,7 +132,7 @@
             </expression-projection>
         </projections>
         <from>
-            <simple-table name="t_order" start-index="34" stop-index="40"/>
+            <simple-table name="t_order" start-index="34" stop-index="40" />
         </from>
     </select>
     <select sql-case-id="select_with_trim_expr_from_expr">
@@ -144,7 +144,7 @@
             </expression-projection>
         </projections>
         <from>
-            <simple-table name="t_order" start-index="40" stop-index="46"/>
+            <simple-table name="t_order" start-index="40" stop-index="46" />
         </from>
     </select>
     <select sql-case-id="select_weight_string">
@@ -158,7 +158,7 @@
     </select>
     <select sql-case-id="select_values">
         <from>
-            <simple-table name="t_order" start-index="29" stop-index="35"/>
+            <simple-table name="t_order" start-index="29" stop-index="35" />
         </from>
         <projections start-index="7" stop-index="22">
             <expression-projection text="VALUES(order_id)" start-index="7" stop-index="22">
diff --git a/test/parser/src/main/resources/case/dml/select-sub-query.xml b/test/parser/src/main/resources/case/dml/select-sub-query.xml
index 7e4c2988bc4..677839f25cb 100644
--- a/test/parser/src/main/resources/case/dml/select-sub-query.xml
+++ b/test/parser/src/main/resources/case/dml/select-sub-query.xml
@@ -38,7 +38,7 @@
     <select sql-case-id="select_sub_query_with_table" parameters="3, 4">
         <projections start-index="7" stop-index="9">
             <shorthand-projection start-index="7" stop-index="9">
-                <owner start-index="7" stop-index="7" name="t"/>
+                <owner start-index="7" stop-index="7" name="t" />
             </shorthand-projection>
         </projections>
         <from>
@@ -49,7 +49,7 @@
                             <shorthand-projection start-index="24" stop-index="24" />
                         </projections>
                         <from>
-                            <simple-table start-index="31" stop-index="37" name="t_order"/>
+                            <simple-table start-index="31" stop-index="37" name="t_order" />
                         </from>
                         <where start-index="39" stop-index="62">
                             <expr>
@@ -231,7 +231,7 @@
                             <simple-table name="t_order" start-index="29" stop-index="35" />
                         </from>
                         <projections start-index="22" stop-index="22">
-                            <expression-projection start-index="22" stop-index="22" text="1"/>
+                            <expression-projection start-index="22" stop-index="22" text="1" />
                         </projections>
                     </select>
                 </subquery>
@@ -242,13 +242,13 @@
     <select sql-case-id="select_with_join_table_subquery">
         <projections start-index="7" stop-index="68">
             <column-projection name="order_id" start-index="7" stop-index="31">
-                <owner start-index="7" stop-index="22" name="t_order_federate"/>
+                <owner start-index="7" stop-index="22" name="t_order_federate" />
             </column-projection>
             <column-projection name="user_id" start-index="34" stop-index="57">
-                <owner start-index="34" stop-index="49" name="t_order_federate"/>
+                <owner start-index="34" stop-index="49" name="t_order_federate" />
             </column-projection>
             <column-projection name="user_id" start-index="60" stop-index="68">
-                <owner start-index="60" stop-index="60" name="u"/>
+                <owner start-index="60" stop-index="60" name="u" />
             </column-projection>
         </projections>
         <from start-index="70" stop-index="90">
@@ -264,7 +264,7 @@
                                     <shorthand-projection start-index="101" stop-index="101" />
                                 </projections>
                                 <from>
-                                    <simple-table start-index="108" stop-index="118" name="t_user_info"/>
+                                    <simple-table start-index="108" stop-index="118" name="t_user_info" />
                                 </from>
                             </select>
                         </subquery>
@@ -277,13 +277,13 @@
                 <binary-operation-expression start-index="132" stop-index="167">
                     <left>
                         <column name="user_id" start-index="132" stop-index="155">
-                            <owner start-index="132" stop-index="147" name="t_order_federate"/>
+                            <owner start-index="132" stop-index="147" name="t_order_federate" />
                         </column>
                     </left>
                     <operator>=</operator>
                     <right>
                         <column name="user_id" start-index="159" stop-index="167">
-                            <owner start-index="159" stop-index="159" name="u"/>
+                            <owner start-index="159" stop-index="159" name="u" />
                         </column>
                     </right>
                 </binary-operation-expression>
@@ -294,10 +294,10 @@
     <select sql-case-id="select_with_projection_subquery">
         <projections start-index="7" stop-index="99">
             <column-projection name="order_id" start-index="7" stop-index="31">
-                <owner start-index="7" stop-index="22" name="t_order_federate"/>
+                <owner start-index="7" stop-index="22" name="t_order_federate" />
             </column-projection>
             <column-projection name="user_id" start-index="34" stop-index="57">
-                <owner start-index="34" stop-index="49" name="t_order_federate"/>
+                <owner start-index="34" stop-index="49" name="t_order_federate" />
             </column-projection>
             <subquery-projection start-index="60" stop-index="99" text="(SELECT COUNT(user_id) FROM t_user_info)">
                 <subquery>
@@ -320,10 +320,10 @@
     <select sql-case-id="select_with_projection_subquery_and_multiple_parameters">
         <projections start-index="7" stop-index="110">
             <column-projection name="order_id" start-index="7" stop-index="31">
-                <owner start-index="7" stop-index="22" name="t_order_federate"/>
+                <owner start-index="7" stop-index="22" name="t_order_federate" />
             </column-projection>
             <column-projection name="user_id" start-index="34" stop-index="57">
-                <owner start-index="34" stop-index="49" name="t_order_federate"/>
+                <owner start-index="34" stop-index="49" name="t_order_federate" />
             </column-projection>
             <subquery-projection start-index="60" stop-index="110" text="(SELECT CONCAT(order_id, user_id) FROM t_user_info)">
                 <subquery>
@@ -346,10 +346,10 @@
     <select sql-case-id="select_with_in_subquery_condition">
         <projections start-index="7" stop-index="57">
             <column-projection name="order_id" start-index="7" stop-index="31">
-                <owner start-index="7" stop-index="22" name="t_order_federate"/>
+                <owner start-index="7" stop-index="22" name="t_order_federate" />
             </column-projection>
             <column-projection name="user_id" start-index="34" stop-index="57">
-                <owner start-index="34" stop-index="49" name="t_order_federate"/>
+                <owner start-index="34" stop-index="49" name="t_order_federate" />
             </column-projection>
         </projections>
         <from start-index="59" stop-index="79">
@@ -381,10 +381,10 @@
     <select sql-case-id="select_with_between_and_subquery_condition">
         <projections start-index="7" stop-index="57">
             <column-projection name="order_id" start-index="7" stop-index="31">
-                <owner start-index="7" stop-index="22" name="t_order_federate"/>
+                <owner start-index="7" stop-index="22" name="t_order_federate" />
             </column-projection>
             <column-projection name="user_id" start-index="34" stop-index="57">
-                <owner start-index="34" stop-index="49" name="t_order_federate"/>
+                <owner start-index="34" stop-index="49" name="t_order_federate" />
             </column-projection>
         </projections>
         <from start-index="59" stop-index="79">
@@ -454,10 +454,10 @@
     <select sql-case-id="select_with_exist_subquery_condition">
         <projections start-index="7" stop-index="57">
             <column-projection name="order_id" start-index="7" stop-index="31">
-                <owner start-index="7" stop-index="22" name="t_order_federate"/>
+                <owner start-index="7" stop-index="22" name="t_order_federate" />
             </column-projection>
             <column-projection name="user_id" start-index="34" stop-index="57">
-                <owner start-index="34" stop-index="49" name="t_order_federate"/>
+                <owner start-index="34" stop-index="49" name="t_order_federate" />
             </column-projection>
         </projections>
         <from start-index="59" stop-index="79">
@@ -479,13 +479,13 @@
                                     <binary-operation-expression start-index="127" stop-index="172">
                                         <left>
                                             <column name="user_id" start-index="127" stop-index="150">
-                                                <owner start-index="127" stop-index="142" name="t_order_federate"/>
+                                                <owner start-index="127" stop-index="142" name="t_order_federate" />
                                             </column>
                                         </left>
                                         <operator>=</operator>
                                         <right>
                                             <column name="user_id" start-index="154" stop-index="172">
-                                                <owner start-index="154" stop-index="164" name="t_user_info"/>
+                                                <owner start-index="154" stop-index="164" name="t_user_info" />
                                             </column>
                                         </right>
                                     </binary-operation-expression>
@@ -501,10 +501,10 @@
     <select sql-case-id="select_with_not_exist_subquery_condition">
         <projections start-index="7" stop-index="57">
             <column-projection name="order_id" start-index="7" stop-index="31">
-                <owner start-index="7" stop-index="22" name="t_order_federate"/>
+                <owner start-index="7" stop-index="22" name="t_order_federate" />
             </column-projection>
             <column-projection name="user_id" start-index="34" stop-index="57">
-                <owner start-index="34" stop-index="49" name="t_order_federate"/>
+                <owner start-index="34" stop-index="49" name="t_order_federate" />
             </column-projection>
         </projections>
         <from start-index="59" stop-index="79">
@@ -527,13 +527,13 @@
                                     <binary-operation-expression start-index="131" stop-index="176">
                                         <left>
                                             <column name="user_id" start-index="131" stop-index="154">
-                                                <owner start-index="131" stop-index="146" name="t_order_federate"/>
+                                                <owner start-index="131" stop-index="146" name="t_order_federate" />
                                             </column>
                                         </left>
                                         <operator>=</operator>
                                         <right>
                                             <column name="user_id" start-index="158" stop-index="176">
-                                                <owner start-index="158" stop-index="168" name="t_user_info"/>
+                                                <owner start-index="158" stop-index="168" name="t_user_info" />
                                             </column>
                                         </right>
                                     </binary-operation-expression>
diff --git a/test/parser/src/main/resources/case/dml/select-with.xml b/test/parser/src/main/resources/case/dml/select-with.xml
index a5cc2945783..082eb92157c 100644
--- a/test/parser/src/main/resources/case/dml/select-with.xml
+++ b/test/parser/src/main/resources/case/dml/select-with.xml
@@ -132,10 +132,10 @@
                         <subquery start-index="276" stop-index="301">
                             <select>
                                 <from start-index="293" stop-index="300">
-                                    <simple-table name="avg_cost" start-index="293" stop-index="300"/>
+                                    <simple-table name="avg_cost" start-index="293" stop-index="300" />
                                 </from>
                                 <projections start-index="284" stop-index="286">
-                                    <column-projection name="avg" start-index="284" stop-index="286"/>
+                                    <column-projection name="avg" start-index="284" stop-index="286" />
                                 </projections>
                             </select>
                         </subquery>
diff --git a/test/parser/src/main/resources/case/dml/select.xml b/test/parser/src/main/resources/case/dml/select.xml
index 71dd44bd0b0..d050f6622d8 100644
--- a/test/parser/src/main/resources/case/dml/select.xml
+++ b/test/parser/src/main/resources/case/dml/select.xml
@@ -29,7 +29,7 @@
 
     <select sql-case-id="select_with_operator_ilike" >
         <projections start-index="7" stop-index="8">
-            <column-projection name="id" start-index="7" stop-index="8"/>
+            <column-projection name="id" start-index="7" stop-index="8" />
         </projections>
         <from>
             <simple-table name="t_order" start-index="15" stop-index="21" />
@@ -38,12 +38,12 @@
             <expr>
                 <binary-operation-expression start-index="29" stop-index="47">
                     <left>
-                        <column name="name" start-index="29" stop-index="32"/>
+                        <column name="name" start-index="29" stop-index="32" />
                     </left>
                     <right>
                         <list-expression start-index="37" stop-index="47">
                             <items>
-                                <literal-expression value="^pg_toast" start-index="37" stop-index="47"/>
+                                <literal-expression value="^pg_toast" start-index="37" stop-index="47" />
                             </items>
                         </list-expression>
                     </right>
@@ -63,7 +63,7 @@
         <projections start-index="7" stop-index="26">
             <expression-projection text="schema()" start-index="7" stop-index="14">
                 <expr>
-                    <function function-name="schema" start-index="7" stop-index="14" text="schema()"/>
+                    <function function-name="schema" start-index="7" stop-index="14" text="schema()" />
                 </expr>
             </expression-projection>
             <expression-projection text="database()" start-index="17" stop-index="26">
@@ -727,7 +727,7 @@
             <simple-table name="t_order" start-index="14" stop-index="20" />
         </from>
         <projections start-index="7" stop-index="7">
-            <shorthand-projection start-index="7" stop-index="7"/>
+            <shorthand-projection start-index="7" stop-index="7" />
         </projections>
         <where start-index="22" stop-index="43">
             <expr>
@@ -809,7 +809,7 @@
                                 <parameter-marker-expression parameter-index="0" start-index="47" stop-index="47" />
                             </items>
                             <items>
-                                <literal-expression value="!" start-index="56" stop-index="58" literal-start-index="58" literal-stop-index="60"/>
+                                <literal-expression value="!" start-index="56" stop-index="58" literal-start-index="58" literal-stop-index="60" />
                             </items>
                         </list-expression>
                     </right>
@@ -869,7 +869,7 @@
                                     <not>false</not>
                                     <left>
                                         <column name="user_id" start-index="93" stop-index="101" literal-start-index="98" literal-stop-index="106">
-                                            <owner name="o" start-index="93" stop-index="93" literal-start-index="98" literal-stop-index="98"/>
+                                            <owner name="o" start-index="93" stop-index="93" literal-start-index="98" literal-stop-index="98" />
                                         </column>
                                     </left>
                                     <right>
@@ -937,14 +937,14 @@
                                             <items>
                                                 <function function-name="CONCAT" literal-text="CONCAT('%%', 'init', '%%')" start-index="67" stop-index="87" literal-stop-index="92" text="CONCAT('%%', ?, '%%')">
                                                     <parameter>
-                                                        <literal-expression value="%%" literal-start-index="74" literal-stop-index="77" start-index="74" stop-index="77"/>
+                                                        <literal-expression value="%%" literal-start-index="74" literal-stop-index="77" start-index="74" stop-index="77" />
                                                     </parameter>
                                                     <parameter>
-                                                        <literal-expression value="init" literal-start-index="80" literal-stop-index="85"/>
-                                                        <parameter-marker-expression parameter-index="0" start-index="80" stop-index="80"/>
+                                                        <literal-expression value="init" literal-start-index="80" literal-stop-index="85" />
+                                                        <parameter-marker-expression parameter-index="0" start-index="80" stop-index="80" />
                                                     </parameter>
                                                     <parameter>
-                                                        <literal-expression value="%%" literal-start-index="88" literal-stop-index="91" start-index="83" stop-index="86"/>
+                                                        <literal-expression value="%%" literal-start-index="88" literal-stop-index="91" start-index="83" stop-index="86" />
                                                     </parameter>
                                                 </function>
                                             </items>
@@ -958,7 +958,7 @@
                                     <not>false</not>
                                     <left>
                                         <column name="user_id" start-index="93" stop-index="101" literal-start-index="98" literal-stop-index="106">
-                                            <owner name="o" start-index="93" stop-index="93" literal-start-index="98" literal-stop-index="98"/>
+                                            <owner name="o" start-index="93" stop-index="93" literal-start-index="98" literal-stop-index="98" />
                                         </column>
                                     </left>
                                     <right>
@@ -1006,7 +1006,7 @@
             <simple-table name="admin" start-index="15" stop-index="19" />
         </from>
         <projections start-index="7" stop-index="8">
-            <column-projection name="id" start-index="7" stop-index="8"/>
+            <column-projection name="id" start-index="7" stop-index="8" />
         </projections>
         <where start-index="21" stop-index="44">
             <expr>
@@ -1052,14 +1052,14 @@
                                             <items>
                                                 <function function-name="CONCAT" text="CONCAT('%%', ?, '%%')" literal-text="CONCAT('%%', 'init', '%%')" start-index="65" stop-index="85" literal-stop-index="90">
                                                     <parameter>
-                                                        <literal-expression value="%%" literal-start-index="72" literal-stop-index="75" start-index="72" stop-index="75"/>
+                                                        <literal-expression value="%%" literal-start-index="72" literal-stop-index="75" start-index="72" stop-index="75" />
                                                     </parameter>
                                                     <parameter>
-                                                        <literal-expression value="init" literal-start-index="78" literal-stop-index="83"/>
-                                                        <parameter-marker-expression parameter-index="0" start-index="78" stop-index="78"/>
+                                                        <literal-expression value="init" literal-start-index="78" literal-stop-index="83" />
+                                                        <parameter-marker-expression parameter-index="0" start-index="78" stop-index="78" />
                                                     </parameter>
                                                     <parameter>
-                                                        <literal-expression value="%%" literal-start-index="86" literal-stop-index="89" start-index="81" stop-index="84"/>
+                                                        <literal-expression value="%%" literal-start-index="86" literal-stop-index="89" start-index="81" stop-index="84" />
                                                     </parameter>
                                                 </function>
                                             </items>
@@ -1073,7 +1073,7 @@
                                     <not>false</not>
                                     <left>
                                         <column name="user_id" start-index="91" stop-index="99" literal-start-index="96" literal-stop-index="104">
-                                            <owner name="o" start-index="91" stop-index="91" literal-start-index="96" literal-stop-index="96"/>
+                                            <owner name="o" start-index="91" stop-index="91" literal-start-index="96" literal-stop-index="96" />
                                         </column>
                                     </left>
                                     <right>
@@ -1975,7 +1975,7 @@
                                             <right>
                                                 <function function-name="ST_GeographyFromText" text="ST_GeographyFromText('SRID=4326;POINT('||?||' '||?||')')" literal-text="ST_GeographyFromText('SRID=4326;POINT('||100||' '||200||')')" start-index="60" stop-index="115" literal-start-index="78" literal-stop-index="137">
                                                     <parameter>
-                                                        <common-expression text="'SRID=4326;POINT('||?||' '||?||')'" literal-text="'SRID=4326;POINT('||100||' '||200||')'" literal-start-index="99" start-index="81" literal-stop-index="136" stop-index="114"/>
+                                                        <common-expression text="'SRID=4326;POINT('||?||' '||?||')'" literal-text="'SRID=4326;POINT('||100||' '||200||')'" literal-start-index="99" start-index="81" literal-stop-index="136" stop-index="114" />
                                                     </parameter>
                                                 </function>
                                             </right>
@@ -2060,7 +2060,7 @@
                                             <right>
                                                 <function function-name="ST_GeographyFromText" text="ST_GeographyFromText('SRID=4326;POINT('||?||' '||?||')')" literal-text="ST_GeographyFromText('SRID=4326;POINT('||100||' '||200||')')" start-index="73" stop-index="128" literal-start-index="109" literal-stop-index="168">
                                                     <parameter>
-                                                        <common-expression text="'SRID=4326;POINT('||?||' '||?||')'" literal-text="'SRID=4326;POINT('||100||' '||200||')'" literal-start-index="130" start-index="94" literal-stop-index="167" stop-index="127"/>
+                                                        <common-expression text="'SRID=4326;POINT('||?||' '||?||')'" literal-text="'SRID=4326;POINT('||100||' '||200||')'" literal-start-index="130" start-index="94" literal-stop-index="167" stop-index="127" />
                                                     </parameter>
                                                 </function>
                                             </right>
@@ -2147,7 +2147,7 @@
                                     <right>
                                         <function function-name="ST_GeographyFromText" literal-text="ST_GeographyFromText('SRID=4326;POINT('||100||' '||200||')')" text="ST_GeographyFromText('SRID=4326;POINT('||?||' '||?||')')" start-index="79" stop-index="134" literal-start-index="115" literal-stop-index="174">
                                             <parameter>
-                                                <common-expression text="'SRID=4326;POINT('||?||' '||?||')'" literal-text="'SRID=4326;POINT('||100||' '||200||')'" literal-start-index="136" start-index="100" literal-stop-index="173" stop-index="133"/>
+                                                <common-expression text="'SRID=4326;POINT('||?||' '||?||')'" literal-text="'SRID=4326;POINT('||100||' '||200||')'" literal-start-index="136" start-index="100" literal-stop-index="173" stop-index="133" />
                                             </parameter>
                                         </function>
                                     </right>
@@ -2250,7 +2250,7 @@
         </projections>
         <order-by>
             <column-item name="order_id" start-index="55" stop-index="70">
-                <owner name="t_order" start-index="55" stop-index="61"/>
+                <owner name="t_order" start-index="55" stop-index="61" />
             </column-item>
         </order-by>
     </select>
@@ -2268,7 +2268,7 @@
         </from>
         <projections start-index="16" stop-index="47" distinct-row="true">
             <shorthand-projection start-index="16" stop-index="24">
-                <owner name="t_order" start-index="16" stop-index="22"/>
+                <owner name="t_order" start-index="16" stop-index="22" />
             </shorthand-projection>
             <column-projection name="order_id" start-index="27" stop-index="47" >
                 <owner name="t_order_item" start-index="27" stop-index="38" />
@@ -2304,7 +2304,7 @@
         </projections>
         <group-by>
             <column-item name="order_id" start-index="55" stop-index="70">
-                <owner name="t_order" start-index="55" stop-index="61"/>
+                <owner name="t_order" start-index="55" stop-index="61" />
             </column-item>
         </group-by>
     </select>
@@ -2556,7 +2556,7 @@
             <simple-table name="t_order_item" start-index="30" stop-index="41" />
         </from>
         <projections distinct-row="true" start-index="15" stop-index="23">
-            <column-projection start-index="16" stop-index="22" name="item_id"/>
+            <column-projection start-index="16" stop-index="22" name="item_id" />
         </projections>
         <order-by>
             <column-item name="item_id" start-index="52" stop-index="58" />
@@ -2568,7 +2568,7 @@
             <simple-table name="t_order_item" start-index="30" stop-index="41" />
         </from>
         <projections distinct-row="true" start-index="15" stop-index="23">
-            <column-projection start-index="16" stop-index="22" name="item_id"/>
+            <column-projection start-index="16" stop-index="22" name="item_id" />
         </projections>
         <order-by>
             <column-item name="item_id" start-index="52" stop-index="58" nulls-order-type="LAST" />
@@ -2696,8 +2696,8 @@
                 </binary-operation-expression>
             </expr>
         </where>
-        <comment start-index="9" stop-index="38" text="/* this is &#x000D;&#x000A; block comment */"/>
-        <comment start-index="45" stop-index="81" text="/* this is another &#x000A; block comment */"/>
+        <comment start-index="9" stop-index="38" text="/* this is &#x000D;&#x000A; block comment */" />
+        <comment start-index="45" stop-index="81" text="/* this is another &#x000A; block comment */" />
     </select>
 
     <select sql-case-id="select_with_nested_block_comment" >
@@ -2707,7 +2707,7 @@
         <projections start-index="7" stop-index="7">
             <shorthand-projection start-index="7" stop-index="7" />
         </projections>
-        <comment start-index="9" stop-index="76" text="/* this is &#x000D;&#x000A; /* this is another &#x000A; block comment */ block comment */"/>
+        <comment start-index="9" stop-index="76" text="/* this is &#x000D;&#x000A; /* this is another &#x000A; block comment */ block comment */" />
     </select>
 
     <select sql-case-id="select_with_single_comment" >
@@ -2730,8 +2730,8 @@
                 </binary-operation-expression>
             </expr>
         </where>
-        <comment start-index="9" stop-index="37" text="-- this is an line comment &#x000D;&#x000A;"/>
-        <comment start-index="44" stop-index="76" text="-- this is another line comment &#x000A;"/>
+        <comment start-index="9" stop-index="37" text="-- this is an line comment &#x000D;&#x000A;" />
+        <comment start-index="44" stop-index="76" text="-- this is another line comment &#x000A;" />
     </select>
 
     <select sql-case-id="select_with_single_comment_without_whitespace" >
@@ -2754,8 +2754,8 @@
                 </binary-operation-expression>
             </expr>
         </where>
-        <comment start-index="9" stop-index="36" text="--this is an line comment &#x000D;&#x000A;"/>
-        <comment start-index="43" stop-index="74" text="--this is another line comment &#x000A;"/>
+        <comment start-index="9" stop-index="36" text="--this is an line comment &#x000D;&#x000A;" />
+        <comment start-index="43" stop-index="74" text="--this is another line comment &#x000A;" />
     </select>
 
     <select sql-case-id="select_alias_as_single_quote_string">
@@ -2962,7 +2962,7 @@
                     <left>
                         <function function-name="DATE_FORMAT" start-index="28" stop-index="64" text="DATE_FORMAT(current_date, '%Y-%m-%d')">
                             <parameter>
-                                <function function-name="current_date" start-index="40" stop-index="51" text="current_date"/>
+                                <function function-name="current_date" start-index="40" stop-index="51" text="current_date" />
                             </parameter>
                             <parameter>
                                 <literal-expression value="%Y-%m-%d" start-index="54" stop-index="63" />
@@ -3038,13 +3038,13 @@
             <expr>
                 <binary-operation-expression start-index="33" stop-index="116" literal-stop-index="123">
                     <left>
-                        <common-expression text="MATCH(t_order_item.description) AGAINST (? IN NATURAL LANGUAGE MODE)" literal-text="MATCH(t_order_item.description) AGAINST ('hello' IN NATURAL LANGUAGE MODE)" start-index="33" stop-index="100" literal-stop-index="106"/>
+                        <common-expression text="MATCH(t_order_item.description) AGAINST (? IN NATURAL LANGUAGE MODE)" literal-text="MATCH(t_order_item.description) AGAINST ('hello' IN NATURAL LANGUAGE MODE)" start-index="33" stop-index="100" literal-stop-index="106" />
                     </left>
                     <operator>AND</operator>
                     <right>
                         <binary-operation-expression start-index="106" stop-index="116" literal-start-index="112" literal-stop-index="123">
                             <left>
-                                <column name="user_id" start-index="106" stop-index="112" literal-start-index="112" literal-stop-index="118"/>
+                                <column name="user_id" start-index="106" stop-index="112" literal-start-index="112" literal-stop-index="118" />
                             </left>
                             <operator>=</operator>
                             <right>
@@ -3096,7 +3096,7 @@
                     <left>
                         <function start-index="28" stop-index="77" function-name="JSON_VALUE" text="JSON_VALUE(items, '$.name' RETURNING VARCHAR(100))">
                             <parameter>
-                                <column name="items" start-index="39" stop-index="43"/>
+                                <column name="items" start-index="39" stop-index="43" />
                             </parameter>
                             <parameter>
                                 <common-expression text="'$.name' RETURNING VARCHAR(100)" start-index="46" stop-index="76" />
@@ -3322,15 +3322,15 @@
             <simple-table name="t_order" start-index="45" stop-index="51" />
         </from>
         <projections start-index="7" stop-index="38">
-            <column-projection name="user_id" start-index="7" stop-index="13"/>
+            <column-projection name="user_id" start-index="7" stop-index="13" />
             <expression-projection text="CAST(order_id AS SIGNED)" start-index="15" stop-index="38">
                 <expr>
                     <function function-name="CAST" start-index="15" stop-index="38" text="CAST(order_id AS SIGNED)" >
                         <parameter>
-                            <column name="order_id" start-index="20" stop-index="27"/>
+                            <column name="order_id" start-index="20" stop-index="27" />
                         </parameter>
                         <parameter>
-                            <data-type value="SIGNED" start-index="32" stop-index="37"/>
+                            <data-type value="SIGNED" start-index="32" stop-index="37" />
                         </parameter>
                     </function>
                 </expr>
@@ -3340,22 +3340,22 @@
 
     <select sql-case-id="select_with_cast_as_unsigned">
         <from>
-            <simple-table name="t_order" start-index="47" stop-index="53"/>
+            <simple-table name="t_order" start-index="47" stop-index="53" />
         </from>
         <projections start-index="7" stop-index="40">
             <expression-projection text="CAST(order_id AS UNSIGNED)" start-index="7" stop-index="32">
                 <expr>
                     <function function-name="CAST" start-index="7" stop-index="32" text="CAST(order_id AS UNSIGNED)" >
                         <parameter>
-                            <column name="order_id" start-index="12" stop-index="19"/>
+                            <column name="order_id" start-index="12" stop-index="19" />
                         </parameter>
                         <parameter>
-                            <data-type value="UNSIGNED" start-index="24" stop-index="31"/>
+                            <data-type value="UNSIGNED" start-index="24" stop-index="31" />
                         </parameter>
                     </function>
                 </expr>
             </expression-projection>
-            <column-projection name="user_id" start-index="34" stop-index="40"/>
+            <column-projection name="user_id" start-index="34" stop-index="40" />
         </projections>
     </select>
 
@@ -3364,15 +3364,15 @@
             <simple-table name="t_order" start-index="49" stop-index="55" />
         </from>
         <projections start-index="7" stop-index="42">
-            <column-projection name="user_id" start-index="7" stop-index="13"/>
+            <column-projection name="user_id" start-index="7" stop-index="13" />
             <expression-projection text="CAST(order_id AS SIGNED INT)" start-index="15" stop-index="42">
                 <expr>
                     <function function-name="CAST" start-index="15" stop-index="42" text="CAST(order_id AS SIGNED INT)" >
                         <parameter>
-                            <column name="order_id" start-index="20" stop-index="27"/>
+                            <column name="order_id" start-index="20" stop-index="27" />
                         </parameter>
                         <parameter>
-                            <data-type value="SIGNED" start-index="32" stop-index="41"/>
+                            <data-type value="SIGNED" start-index="32" stop-index="41" />
                         </parameter>
                     </function>
                 </expr>
@@ -3382,22 +3382,22 @@
 
     <select sql-case-id="select_with_cast_as_unsigned_int">
         <from>
-            <simple-table name="t_order" start-index="51" stop-index="57"/>
+            <simple-table name="t_order" start-index="51" stop-index="57" />
         </from>
         <projections start-index="7" stop-index="44">
             <expression-projection text="CAST(order_id AS UNSIGNED INT)" start-index="7" stop-index="36">
                 <expr>
                     <function function-name="CAST" start-index="7" stop-index="36" text="CAST(order_id AS UNSIGNED INT)" >
                         <parameter>
-                            <column name="order_id" start-index="12" stop-index="19"/>
+                            <column name="order_id" start-index="12" stop-index="19" />
                         </parameter>
                         <parameter>
-                            <data-type value="UNSIGNED" start-index="24" stop-index="35"/>
+                            <data-type value="UNSIGNED" start-index="24" stop-index="35" />
                         </parameter>
                     </function>
                 </expr>
             </expression-projection>
-            <column-projection name="user_id" start-index="38" stop-index="44"/>
+            <column-projection name="user_id" start-index="38" stop-index="44" />
         </projections>
     </select>
     
@@ -3406,15 +3406,15 @@
             <simple-table name="t_order" start-index="53" stop-index="59" />
         </from>
         <projections start-index="7" stop-index="46">
-            <column-projection name="user_id" start-index="7" stop-index="13"/>
+            <column-projection name="user_id" start-index="7" stop-index="13" />
             <expression-projection text="CAST(order_id AS SIGNED INTEGER)" start-index="15" stop-index="46">
                 <expr>
                     <function function-name="CAST" start-index="15" stop-index="46" text="CAST(order_id AS SIGNED INTEGER)" >
                         <parameter>
-                            <column name="order_id" start-index="20" stop-index="27"/>
+                            <column name="order_id" start-index="20" stop-index="27" />
                         </parameter>
                         <parameter>
-                            <data-type value="SIGNED" start-index="32" stop-index="45"/>
+                            <data-type value="SIGNED" start-index="32" stop-index="45" />
                         </parameter>
                     </function>
                 </expr>
@@ -3424,22 +3424,22 @@
 
     <select sql-case-id="select_with_cast_as_unsigned_integer">
         <from>
-            <simple-table name="t_order" start-index="55" stop-index="61"/>
+            <simple-table name="t_order" start-index="55" stop-index="61" />
         </from>
         <projections start-index="7" stop-index="48">
             <expression-projection text="CAST(order_id AS UNSIGNED INTEGER)" start-index="7" stop-index="40">
                 <expr>
                     <function function-name="CAST" start-index="7" stop-index="40" text="CAST(order_id AS UNSIGNED INTEGER)" >
                         <parameter>
-                            <column name="order_id" start-index="12" stop-index="19"/>
+                            <column name="order_id" start-index="12" stop-index="19" />
                         </parameter>
                         <parameter>
-                            <data-type value="UNSIGNED" start-index="24" stop-index="39"/>
+                            <data-type value="UNSIGNED" start-index="24" stop-index="39" />
                         </parameter>
                     </function>
                 </expr>
             </expression-projection>
-            <column-projection name="user_id" start-index="42" stop-index="48"/>
+            <column-projection name="user_id" start-index="42" stop-index="48" />
         </projections>
     </select>
     
@@ -3516,7 +3516,7 @@
         </projections>
         <order-by>
             <column-item name="department_id" start-index="301" stop-index="315" nulls-order-type="LAST">
-                <owner name="a" start-index="301" stop-index="301"/>
+                <owner name="a" start-index="301" stop-index="301" />
             </column-item>
         </order-by>
     </select>
@@ -3533,7 +3533,7 @@
                 <binary-operation-expression start-index="54" stop-index="73">
                     <left>
                         <column name="amount_sold" start-index="54" stop-index="66" >
-                            <owner name="s" start-index="54" stop-index="54"/>
+                            <owner name="s" start-index="54" stop-index="54" />
                         </column>
                     </left>
                     <operator>&gt;</operator>
@@ -3562,25 +3562,25 @@
             </join-table>
         </from>
         <projections start-index="7" stop-index="67">
-            <column-projection name="last_name" start-index="7" stop-index="15"/>
-            <column-projection name="job_id" start-index="18" stop-index="23"/>
+            <column-projection name="last_name" start-index="7" stop-index="15" />
+            <column-projection name="job_id" start-index="18" stop-index="23" />
             <column-projection name="department_id" start-index="26" stop-index="50">
                 <owner name="departments" start-index="26" stop-index="36" />
             </column-projection>
-            <column-projection name="department_name" start-index="53" stop-index="67"/>
+            <column-projection name="department_name" start-index="53" stop-index="67" />
         </projections>
         <where start-index="97" stop-index="153">
             <expr>
                 <binary-operation-expression start-index="103" stop-index="153">
                     <left>
                         <column name="department_id" start-index="103" stop-index="125" >
-                            <owner name="employees" start-index="103" stop-index="111"/>
+                            <owner name="employees" start-index="103" stop-index="111" />
                         </column>
                     </left>
                     <operator>=</operator>
                     <right>
                         <column name="department_id" start-index="129" stop-index="153" >
-                            <owner name="departments" start-index="129" stop-index="139"/>
+                            <owner name="departments" start-index="129" stop-index="139" />
                         </column>
                     </right>
                 </binary-operation-expression>
@@ -3603,10 +3603,10 @@
                         <subquery>
                             <select>
                                 <projections start-index="42" stop-index="42">
-                                    <shorthand-projection start-index="42" stop-index="42"/>
+                                    <shorthand-projection start-index="42" stop-index="42" />
                                 </projections>
                                 <from>
-                                    <simple-table name="departments" alias="d" start-index="49" stop-index="61"/>
+                                    <simple-table name="departments" alias="d" start-index="49" stop-index="61" />
                                 </from>
                                 <where start-index="63" stop-index="101">
                                     <expr>
@@ -3650,9 +3650,9 @@
             <simple-table name="employees" start-index="47" stop-index="55" />
         </from>
         <projections start-index="7" stop-index="40">
-            <column-projection name="last_name" start-index="7" stop-index="15"/>
-            <column-projection name="employee_id" start-index="18" stop-index="28"/>
-            <column-projection name="manager_id" start-index="31" stop-index="40"/>
+            <column-projection name="last_name" start-index="7" stop-index="15" />
+            <column-projection name="employee_id" start-index="18" stop-index="28" />
+            <column-projection name="manager_id" start-index="31" stop-index="40" />
         </projections>
         <order-by>
             <column-item name="last_name" start-index="102" stop-index="110" nulls-order-type="LAST" />
@@ -3670,7 +3670,7 @@
             <expr>
                 <binary-operation-expression start-index="28" stop-index="46">
                     <left>
-                        <column name="date" start-index="28" stop-index="31"/>
+                        <column name="date" start-index="28" stop-index="31" />
                     </left>
                     <right>
                         <function function-name="CURRENT_DATE" start-index="35" stop-index="46" text="CURRENT_DATE" />
@@ -3692,7 +3692,7 @@
             <expr>
                 <binary-operation-expression start-index="28" stop-index="48">
                     <left>
-                        <column name="date" start-index="28" stop-index="31"/>
+                        <column name="date" start-index="28" stop-index="31" />
                     </left>
                     <right>
                         <function function-name="CURRENT_DATE" start-index="35" stop-index="48" text="CURRENT_DATE()" />
@@ -3714,7 +3714,7 @@
             <expr>
                 <binary-operation-expression start-index="28" stop-index="46">
                     <left>
-                        <column name="time" start-index="28" stop-index="31"/>
+                        <column name="time" start-index="28" stop-index="31" />
                     </left>
                     <right>
                         <function function-name="CURRENT_TIME" start-index="35" stop-index="46" text="CURRENT_TIME" />
@@ -3736,7 +3736,7 @@
             <expr>
                 <binary-operation-expression start-index="28" stop-index="48">
                     <left>
-                        <column name="time" start-index="28" stop-index="31"/>
+                        <column name="time" start-index="28" stop-index="31" />
                     </left>
                     <right>
                         <function function-name="CURRENT_TIME" start-index="35" stop-index="48" text="CURRENT_TIME()" />
@@ -3752,14 +3752,14 @@
             <simple-table name="sales_view_ref" start-index="35" stop-index="48" />
         </from>
         <projections start-index="7" stop-index="28">
-            <column-projection name="country" start-index="7" stop-index="13"/>
-            <column-projection name="prod" start-index="16" stop-index="19"/>
-            <column-projection name="year" start-index="22" stop-index="25"/>
-            <column-projection name="s" start-index="28" stop-index="28"/>
+            <column-projection name="country" start-index="7" stop-index="13" />
+            <column-projection name="prod" start-index="16" stop-index="19" />
+            <column-projection name="year" start-index="22" stop-index="25" />
+            <column-projection name="s" start-index="28" stop-index="28" />
         </projections>
         <model start-index="50" stop-index="318">
-            <cell-assignment-column name="s" start-index="182" stop-index="182"/>
-            <cell-assignment-column name="s" start-index="265" stop-index="265"/>
+            <cell-assignment-column name="s" start-index="182" stop-index="182" />
+            <cell-assignment-column name="s" start-index="265" stop-index="265" />
         </model>
         <order-by>
             <column-item name="country" start-index="329" stop-index="335" nulls-order-type="LAST" />
@@ -3774,12 +3774,12 @@
                 <subquery>
                     <select>
                         <from start-index="81" stop-index="94">
-                            <simple-table name="sales_view_ref" start-index="81" stop-index="94"/>
+                            <simple-table name="sales_view_ref" start-index="81" stop-index="94" />
                         </from>
                         <projections start-index="46" stop-index="74">
-                            <column-projection name="country" start-index="46" stop-index="52"/>
-                            <column-projection name="year" start-index="55" stop-index="58"/>
-                            <aggregation-projection type="SUM" alias="sale" inner-expression="(sale)" start-index="61" stop-index="69"/>
+                            <column-projection name="country" start-index="46" stop-index="52" />
+                            <column-projection name="year" start-index="55" stop-index="58" />
+                            <aggregation-projection type="SUM" alias="sale" inner-expression="(sale)" start-index="61" stop-index="69" />
                         </projections>
                         <group-by>
                             <column-item name="country" start-index="105" stop-index="111" nulls-order-type="LAST" />
@@ -3790,13 +3790,13 @@
             </subquery-table>
         </from>
         <projections start-index="7" stop-index="31">
-            <column-projection name="country" start-index="7" stop-index="13"/>
-            <column-projection name="year" start-index="16" stop-index="19"/>
-            <column-projection name="sale" start-index="22" stop-index="25"/>
-            <column-projection name="csum" start-index="28" stop-index="31"/>
+            <column-projection name="country" start-index="7" stop-index="13" />
+            <column-projection name="year" start-index="16" stop-index="19" />
+            <column-projection name="sale" start-index="22" stop-index="25" />
+            <column-projection name="csum" start-index="28" stop-index="31" />
         </projections>
         <model start-index="120" stop-index="279">
-            <cell-assignment-column name="csum" start-index="186" stop-index="189"/>
+            <cell-assignment-column name="csum" start-index="186" stop-index="189" />
         </model>
         <order-by>
             <column-item name="country" start-index="290" stop-index="296" nulls-order-type="LAST" />
@@ -3809,10 +3809,10 @@
             <simple-table name="sales_view" start-index="78" stop-index="87" />
         </from>
         <projections start-index="7" stop-index="71">
-            <expression-projection text="SUBSTR(country,1,20)" alias="country" start-index="7" stop-index="34"/>
-            <expression-projection text="SUBSTR(prod,1,15)" alias="prod" start-index="37" stop-index="58"/>
-            <column-projection name="year" start-index="61" stop-index="64"/>
-            <column-projection name="sales" start-index="67" stop-index="71"/>
+            <expression-projection text="SUBSTR(country,1,20)" alias="country" start-index="7" stop-index="34" />
+            <expression-projection text="SUBSTR(prod,1,15)" alias="prod" start-index="37" stop-index="58" />
+            <column-projection name="year" start-index="61" stop-index="64" />
+            <column-projection name="sales" start-index="67" stop-index="71" />
         </projections>
         <where start-index="89" stop-index="109">
             <expr>
@@ -3828,8 +3828,8 @@
             </expr>
         </where>
         <model start-index="111" stop-index="302">
-            <cell-assignment-column name="sales" start-index="215" stop-index="219"/>
-            <cell-assignment-column name="prod" start-index="225" stop-index="228"/>
+            <cell-assignment-column name="sales" start-index="215" stop-index="219" />
+            <cell-assignment-column name="prod" start-index="225" stop-index="228" />
         </model>
         <order-by>
             <column-item name="country" start-index="313" stop-index="319" nulls-order-type="LAST" />
@@ -3843,17 +3843,17 @@
             <simple-table name="sales_view" start-index="72" stop-index="81" />
         </from>
         <projections start-index="7" stop-index="65">
-            <expression-projection text="SUBSTR(country,1,20)" alias="country" start-index="7" stop-index="34"/>
-            <column-projection name="year" start-index="37" stop-index="40"/>
-            <column-projection name="localsales" start-index="43" stop-index="52"/>
-            <column-projection name="dollarsales" start-index="55" stop-index="65"/>
+            <expression-projection text="SUBSTR(country,1,20)" alias="country" start-index="7" stop-index="34" />
+            <column-projection name="year" start-index="37" stop-index="40" />
+            <column-projection name="localsales" start-index="43" stop-index="52" />
+            <column-projection name="dollarsales" start-index="55" stop-index="65" />
         </projections>
         <where start-index="83" stop-index="119">
             <expr>
                 <in-expression start-index="89" stop-index="119">
                     <not>false</not>
                     <left>
-                        <column name="country" start-index="89" stop-index="95"/>
+                        <column name="country" start-index="89" stop-index="95" />
                     </left>
                     <right>
                         <list-expression start-index="100" stop-index="119">
@@ -3878,14 +3878,14 @@
                     <simple-table name="dollar_conv" start-index="239" stop-index="249" />
                 </from>
                 <projections start-index="205" stop-index="232">
-                    <column-projection name="country" start-index="205" stop-index="211"/>
-                    <column-projection name="exchange_rate" alias="er" start-index="214" stop-index="232"/>
+                    <column-projection name="country" start-index="205" stop-index="211" />
+                    <column-projection name="exchange_rate" alias="er" start-index="214" stop-index="232" />
                 </projections>
             </reference-model-select>
-            <cell-assignment-column name="localsales" start-index="424" stop-index="433"/>
-            <cell-assignment-column name="dollarsales" start-index="486" stop-index="496"/>
-            <cell-assignment-column name="localsales" start-index="578" stop-index="587"/>
-            <cell-assignment-column name="dollarsales" start-index="640" stop-index="650"/>
+            <cell-assignment-column name="localsales" start-index="424" stop-index="433" />
+            <cell-assignment-column name="dollarsales" start-index="486" stop-index="496" />
+            <cell-assignment-column name="localsales" start-index="578" stop-index="587" />
+            <cell-assignment-column name="dollarsales" start-index="640" stop-index="650" />
         </model>
     </select>
 
@@ -3894,8 +3894,8 @@
             <simple-table name="sales_view" start-index="24" stop-index="33" />
         </from>
         <projections start-index="7" stop-index="17">
-            <column-projection name="year" start-index="7" stop-index="10"/>
-            <column-projection name="sales" start-index="13" stop-index="17"/>
+            <column-projection name="year" start-index="7" stop-index="10" />
+            <column-projection name="sales" start-index="13" stop-index="17" />
         </projections>
         <where start-index="35" stop-index="73">
             <expr>
@@ -3927,7 +3927,7 @@
             </expr>
         </where>
         <model start-index="75" stop-index="196">
-            <cell-assignment-column name="sales" start-index="147" stop-index="151"/>
+            <cell-assignment-column name="sales" start-index="147" stop-index="151" />
             <order-by>
                 <column-item name="year" order-direction="DESC" start-index="167" stop-index="170" />
             </order-by>
@@ -3942,22 +3942,22 @@
             <simple-table name="sales_view" start-index="38" stop-index="47" />
         </from>
         <projections start-index="7" stop-index="31">
-            <column-projection name="country" start-index="7" stop-index="13"/>
-            <column-projection name="product" start-index="16" stop-index="22"/>
-            <column-projection name="year" start-index="25" stop-index="28"/>
-            <column-projection name="s" start-index="31" stop-index="31"/>
+            <column-projection name="country" start-index="7" stop-index="13" />
+            <column-projection name="product" start-index="16" stop-index="22" />
+            <column-projection name="year" start-index="25" stop-index="28" />
+            <column-projection name="s" start-index="31" stop-index="31" />
         </projections>
         <model start-index="49" stop-index="283">
-            <cell-assignment-column name="s" start-index="137" stop-index="137"/>
-            <cell-assignment-column name="country" start-index="144" stop-index="150"/>
-            <cell-assignment-column name="product" start-index="153" stop-index="159"/>
-            <cell-assignment-column name="year" start-index="162" stop-index="165"/>
+            <cell-assignment-column name="s" start-index="137" stop-index="137" />
+            <cell-assignment-column name="country" start-index="144" stop-index="150" />
+            <cell-assignment-column name="product" start-index="153" stop-index="159" />
+            <cell-assignment-column name="year" start-index="162" stop-index="165" />
             <cell-assignment-select>
                 <from>
                     <simple-table name="sales_view" start-index="222" stop-index="231" />
                 </from>
                 <projections start-index="188" stop-index="215" distinct-row="true">
-                    <expression-projection text="new_country" start-index="188" stop-index="200"/>
+                    <expression-projection text="new_country" start-index="188" stop-index="200" />
                     <column-projection name="product" start-index="203" stop-index="209" />
                     <column-projection name="year" start-index="212" stop-index="215" />
                 </projections>
@@ -3990,9 +3990,9 @@
         <projections start-index="25" stop-index="25">
             <shorthand-projection start-index="25" stop-index="25" />
         </projections>
-        <comment start-index="0" stop-index="17" text="-- begin comments&#x000A;"/>
-        <comment start-index="32" stop-index="49" text="# middle comments&#x000A;"/>
-        <comment start-index="60" stop-index="74" text="-- end comments"/>
+        <comment start-index="0" stop-index="17" text="-- begin comments&#x000A;" />
+        <comment start-index="32" stop-index="49" text="# middle comments&#x000A;" />
+        <comment start-index="60" stop-index="74" text="-- end comments" />
     </select>
 
     <select sql-case-id="select_with_model_in">
@@ -4012,14 +4012,14 @@
             </subquery-table>
         </from>
         <projections start-index="7" stop-index="40">
-            <column-projection name="order_id_value" start-index="7" stop-index="20"/>
-            <column-projection name="order_item_id_value" start-index="22" stop-index="40"/>
+            <column-projection name="order_id_value" start-index="7" stop-index="20" />
+            <column-projection name="order_item_id_value" start-index="22" stop-index="40" />
         </projections>
     </select>
     
     <select sql-case-id="select_with_dollar_parameter_for_postgresql" parameters="1, 12" >
         <projections start-index="7" stop-index="14">
-            <column-projection name="order_id" start-index="7" stop-index="14"/>
+            <column-projection name="order_id" start-index="7" stop-index="14" />
         </projections>
         <from>
             <simple-table name="t_order" start-index="21" stop-index="27" />
@@ -4258,8 +4258,8 @@
 
     <select sql-case-id="select_with_underscore_charset" >
         <projections start-index="7" stop-index="14">
-            <column-projection name="_code" start-index="7" stop-index="11"/>
-            <column-projection name="_a" start-index="13" stop-index="14"/>
+            <column-projection name="_code" start-index="7" stop-index="11" />
+            <column-projection name="_a" start-index="13" stop-index="14" />
         </projections>
         <from>
             <simple-table name="t_order" start-index="21" stop-index="27" />
@@ -4328,8 +4328,8 @@
             <simple-table name="t_order" start-index="28" stop-index="34" />
         </from>
         <projections start-index="7" stop-index="21">
-            <column-projection name="user_id" start-index="7" stop-index="13"/>
-            <column-projection name="status" start-index="16" stop-index="21"/>
+            <column-projection name="user_id" start-index="7" stop-index="13" />
+            <column-projection name="status" start-index="16" stop-index="21" />
         </projections>
         <where start-index="36" stop-index="53">
             <expr>
@@ -4351,8 +4351,8 @@
             <simple-table name="t_order" start-index="29" stop-index="35" />
         </from>
         <projections start-index="7" stop-index="22">
-            <column-projection name="order_id" start-index="7" stop-index="14"/>
-            <column-projection name="status" start-index="17" stop-index="22"/>
+            <column-projection name="order_id" start-index="7" stop-index="14" />
+            <column-projection name="status" start-index="17" stop-index="22" />
         </projections>
     </select>
 
@@ -4394,8 +4394,8 @@
             <simple-table name="t_order" start-index="97" stop-index="103" />
         </from>
         <projections start-index="41" stop-index="90">
-            <column-projection name="order_id" alias="ns1:order_id" start-index="41" stop-index="66"/>
-            <column-projection name="status" alias="ns1:status" start-index="69" stop-index="90"/>
+            <column-projection name="order_id" alias="ns1:order_id" start-index="41" stop-index="66" />
+            <column-projection name="status" alias="ns1:status" start-index="69" stop-index="90" />
         </projections>
     </select>
 
@@ -4404,8 +4404,8 @@
             <simple-table name="t_order" start-index="129" stop-index="135" />
         </from>
         <projections start-index="73" stop-index="122">
-            <column-projection name="order_id" alias="ns1:order_id" start-index="73" stop-index="98"/>
-            <column-projection name="status" alias="ns1:status" start-index="101" stop-index="122"/>
+            <column-projection name="order_id" alias="ns1:order_id" start-index="73" stop-index="98" />
+            <column-projection name="status" alias="ns1:status" start-index="101" stop-index="122" />
         </projections>
     </select>
 
@@ -4426,7 +4426,7 @@
             <column-projection name="order_id" start-index="7" stop-index="14" />
             <expression-projection text="ROW_NUMBER () OVER (PARTITION BY user_id ORDER BY order_id DESC)" start-index="17" stop-index="94" alias="row_number">
                 <expr>
-                    <function function-name="ROW_NUMBER" start-index="17" stop-index="80" text="ROW_NUMBER () OVER (PARTITION BY user_id ORDER BY order_id DESC)"/>
+                    <function function-name="ROW_NUMBER" start-index="17" stop-index="80" text="ROW_NUMBER () OVER (PARTITION BY user_id ORDER BY order_id DESC)" />
                 </expr>
             </expression-projection>
         </projections>
@@ -4437,7 +4437,7 @@
             <expr>
                 <binary-operation-expression start-index="115" stop-index="126">
                     <left>
-                        <column name="order_id" start-index="115" stop-index="122"/>
+                        <column name="order_id" start-index="115" stop-index="122" />
                     </left>
                     <right>
                         <literal-expression value="1" start-index="126" stop-index="126" />
@@ -4474,7 +4474,7 @@
             <column-projection name="salary" start-index="33" stop-index="38" />
             <expression-projection text="PERCENT_RANK() OVER (PARTITION BY department_id ORDER BY salary DESC)" start-index="41" stop-index="115" alias="pr">
                 <expr>
-                    <function function-name="PERCENT_RANK" start-index="41" stop-index="109" text="PERCENT_RANK() OVER (PARTITION BY department_id ORDER BY salary DESC)"/>
+                    <function function-name="PERCENT_RANK" start-index="41" stop-index="109" text="PERCENT_RANK() OVER (PARTITION BY department_id ORDER BY salary DESC)" />
                 </expr>
             </expression-projection>
         </projections>
@@ -4513,7 +4513,7 @@
                 <in-expression start-index="171" stop-index="195">
                     <not>false</not>
                     <left>
-                        <column name="department_id" start-index="171" stop-index="183"/>
+                        <column name="department_id" start-index="171" stop-index="183" />
                     </left>
                     <right>
                         <list-expression start-index="188" stop-index="195">
@@ -4595,7 +4595,7 @@
             <expression-projection text="REGR_INTERCEPT(SYSDATE-hire_date, salary) OVER (PARTITION BY job_id)" start-index="111" stop-index="185" alias="intcpt" />
             <expression-projection text="REGR_R2(SYSDATE-hire_date, salary) OVER (PARTITION BY job_id)" start-index="188" stop-index="253" alias="rsqr" />
             <expression-projection text="REGR_COUNT(SYSDATE-hire_date, salary) OVER (PARTITION BY job_id)" start-index="256" stop-index="325" alias="count" />
-            <expression-projection text="REGR_AVGX(SYSDATE-hire_date, salary) OVER (PARTITION BY job_id)" start-index="328" stop-index="395" alias="avgx"/>
+            <expression-projection text="REGR_AVGX(SYSDATE-hire_date, salary) OVER (PARTITION BY job_id)" start-index="328" stop-index="395" alias="avgx" />
             <expression-projection text="REGR_AVGY(SYSDATE-hire_date, salary) OVER (PARTITION BY job_id)" start-index="398" stop-index="465" alias="avgy" />
         </projections>
         <from>
@@ -4631,7 +4631,7 @@
             <expression-projection text="LPAD('Page 1',15,'*.')" alias="LPAD example" start-index="7" stop-index="43" />
         </projections>
         <from>
-            <simple-table name="DUAL" start-index="50" stop-index="53"/>
+            <simple-table name="DUAL" start-index="50" stop-index="53" />
         </from>
     </select>
 
diff --git a/test/parser/src/main/resources/case/dml/table.xml b/test/parser/src/main/resources/case/dml/table.xml
index e21efe15a8d..47b227aeb53 100644
--- a/test/parser/src/main/resources/case/dml/table.xml
+++ b/test/parser/src/main/resources/case/dml/table.xml
@@ -24,7 +24,7 @@
         </order-by>
         <limit start-index="32" stop-index="47">
             <offset value="2" literal-start-index="47" literal-stop-index="47" />
-            <row-count value="1" start-index="38" stop-index="38"/>
+            <row-count value="1" start-index="38" stop-index="38" />
         </limit>
     </select>
     
diff --git a/test/parser/src/main/resources/case/dml/update.xml b/test/parser/src/main/resources/case/dml/update.xml
index 271a49ddc09..a83b53f711d 100644
--- a/test/parser/src/main/resources/case/dml/update.xml
+++ b/test/parser/src/main/resources/case/dml/update.xml
@@ -19,7 +19,7 @@
 <sql-parser-test-cases>
     <update sql-case-id="update_without_alias" parameters="'update', 1, 1">
         <table start-index="7" stop-index="13">
-            <simple-table name="t_order" start-index="7" stop-index="13"/>
+            <simple-table name="t_order" start-index="7" stop-index="13" />
         </table>
         <set start-index="15" stop-index="28" literal-stop-index="35">
             <assignment start-index="19" stop-index="28" literal-stop-index="35">
@@ -167,7 +167,7 @@
 
     <update sql-case-id="update_equal_with_geography" parameters="'2017-06-07', 100, 200, '{&quot;rule2&quot;:&quot;null2&quot;}', 3, 5, 7, 200">
         <table start-index="7" stop-index="13">
-            <simple-table name="t_order" start-index="7" stop-index="13"/>
+            <simple-table name="t_order" start-index="7" stop-index="13" />
         </table>
         <set start-index="15" stop-index="168" literal-stop-index="201">
             <assignment start-index="19" stop-index="32" literal-stop-index="43">
@@ -188,7 +188,7 @@
                 <assignment-value>
                     <function function-name="ST_GeographyFromText" text="ST_GeographyFromText('SRID=4326;POINT('||?||' '||?||')')" literal-text="ST_GeographyFromText('SRID=4326;POINT('||100||' '||200||')')" start-index="61" stop-index="116" literal-start-index="72" literal-stop-index="131">
                         <parameter>
-                            <common-expression text="'SRID=4326;POINT('||?||' '||?||')'" literal-text="'SRID=4326;POINT('||100||' '||200||')'" literal-start-index="93" start-index="82" literal-stop-index="130" stop-index="115"/>
... 2367 lines suppressed ...