Commit ff0c9d95 authored by terrymanu's avatar terrymanu
Browse files

for #601: for parameters attribute, use comma delimiter to replace blank in parser test case

parent 63c2a2fa

sharding-core/src/test/java/io/shardingsphere/core/parsing/integrate/jaxb/root/ParserResult.java

+12 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


package io.shardingsphere.core.parsing.integrate.jaxb.root;



import com.google.common.base.Splitter;

import io.shardingsphere.core.parsing.integrate.jaxb.condition.ExpectedOrCondition;

import io.shardingsphere.core.parsing.integrate.jaxb.groupby.ExpectedGroupByColumn;

import io.shardingsphere.core.parsing.integrate.jaxb.item.ExpectedAggregationSelectItem;
@@ -32,7 +33,7 @@ import javax.xml.bind.annotation.XmlAccessorType; 
import javax.xml.bind.annotation.XmlAttribute;

import javax.xml.bind.annotation.XmlElement;

import javax.xml.bind.annotation.XmlElementWrapper;

import javax.xml.bind.annotation.XmlList;

import java.util.Collections;

import java.util.LinkedList;

import java.util.List;
@@ -45,8 +46,7 @@ public final class ParserResult { 
    private String sqlCaseId;

    

    @XmlAttribute

    @XmlList

    private List<String> parameters = new LinkedList<>();

    private String parameters;

    

    @XmlElementWrapper

    @XmlElement(name = "table")
@@ -72,4 +72,13 @@ public final class ParserResult { 
    

    @XmlElement 

    private ExpectedLimit limit;

    

    /**

     * Get parameters.

     * 

     * @return parameters

     */

    public List<String> getParameters() {

        return null == parameters ? Collections.<String>emptyList() : Splitter.on(",").trimResults().splitToList(parameters);

    }

}

sharding-core/src/test/resources/parser/delete.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<parser-result-sets>

    <parser-result sql-case-id="assertDeleteWithShardingValue" parameters="1000 1001 'init'">

    <parser-result sql-case-id="assertDeleteWithShardingValue" parameters="1000, 1001, 'init'">

        <tables>

            <table name="t_order"/>

        </tables>

sharding-core/src/test/resources/parser/insert.xml

+19 −19
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<parser-result-sets>

    <parser-result sql-case-id="assertInsertWithAllPlaceholders" parameters="1 1 'init'">

    <parser-result sql-case-id="assertInsertWithAllPlaceholders" parameters="1, 1, 'init'">

        <tables>

            <table name="t_order" />

        </tables>
@@ -20,7 +20,7 @@ 
        </or-condition>

    </parser-result>

    

    <parser-result sql-case-id="assertInsertWithPartialPlaceholder" parameters="1 1">

    <parser-result sql-case-id="assertInsertWithPartialPlaceholder" parameters="1, 1">

        <tables>

            <table name="t_order" />

        </tables>
@@ -40,7 +40,7 @@ 
        </or-condition>

    </parser-result>

    

    <parser-result sql-case-id="assertInsertWithGenerateKeyColumn" parameters="10000 1000 10">

    <parser-result sql-case-id="assertInsertWithGenerateKeyColumn" parameters="10000, 1000, 10">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -63,7 +63,7 @@ 
        </or-condition>

    </parser-result>

    

    <parser-result sql-case-id="assertInsertWithoutGenerateKeyColumn" parameters="1000 10">

    <parser-result sql-case-id="assertInsertWithoutGenerateKeyColumn" parameters="1000, 10">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -88,7 +88,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertSetWithAllPlaceholders" parameters="1 1 'init'">

    <parser-result sql-case-id="assertInsertSetWithAllPlaceholders" parameters="1, 1, 'init'">

        <tables>

            <table name="t_order" />

        </tables>
@@ -108,7 +108,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertSetWithPartialPlaceholder" parameters="1 1">

    <parser-result sql-case-id="assertInsertSetWithPartialPlaceholder" parameters="1, 1">

        <tables>

            <table name="t_order" />

        </tables>
@@ -128,7 +128,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertSetWithGenerateKeyColumn" parameters="10000 1000 10">

    <parser-result sql-case-id="assertInsertSetWithGenerateKeyColumn" parameters="10000, 1000, 10">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -151,7 +151,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertSetWithoutGenerateKeyColumn" parameters="1000 10">

    <parser-result sql-case-id="assertInsertSetWithoutGenerateKeyColumn" parameters="1000, 10">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -171,7 +171,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertOnDuplicateKeyUpdate" parameters="1 1 'init'">

    <parser-result sql-case-id="assertInsertOnDuplicateKeyUpdate" parameters="1, 1, 'init'">

        <tables>

            <table name="t_order" />

        </tables>
@@ -191,7 +191,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertWithTableIdentifier" parameters="1 1 'init'">

    <parser-result sql-case-id="assertInsertWithTableIdentifier" parameters="1, 1, 'init'">

        <tables>

            <table name="t_order" />

        </tables>
@@ -214,7 +214,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertSetWithTableIdentifier" parameters="1 1 'init'">

    <parser-result sql-case-id="assertInsertSetWithTableIdentifier" parameters="1, 1, 'init'">

        <tables>

            <table name="t_order" />

        </tables>
@@ -237,7 +237,7 @@ 
        </or-condition>

    </parser-result>



    <!--<parser-result sql-case-id="assertInsertOnDuplicateKeyUpdateWithTableIdentifier" parameters="1 1 'init'">-->

    <!--<parser-result sql-case-id="assertInsertOnDuplicateKeyUpdateWithTableIdentifier" parameters="1, 1, 'init'">-->

        <!--<tables>-->

            <!--<table name="t_order" />-->

        <!--</tables>-->
@@ -262,7 +262,7 @@ 
        <!--</or-condition>-->

    <!--</parser-result>-->



    <parser-result sql-case-id="assertBatchInsertWithGenerateKeyColumn" parameters="10000 1000 10 10010 1001 10">

    <parser-result sql-case-id="assertBatchInsertWithGenerateKeyColumn" parameters="10000, 1000, 10, 10010, 1001, 10">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -296,7 +296,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertBatchInsertWithoutGenerateKeyColumn" parameters="1000 10 1001 10">

    <parser-result sql-case-id="assertBatchInsertWithoutGenerateKeyColumn" parameters="1000, 10, 1001, 10">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -329,7 +329,7 @@ 
        </or-condition>

    </parser-result>

    

    <parser-result sql-case-id="assertInsertWithJsonAndGeo" parameters="7 200 100 200 '{&quot;rule&quot;:&quot;null&quot;}'">

    <parser-result sql-case-id="assertInsertWithJsonAndGeo" parameters="7, 200, 100, 200, '{&quot;rule&quot;:&quot;null&quot;}'">

        <tables>assertInsertWithJsonAndGeo

            <table name="t_place" />

        </tables>
@@ -349,7 +349,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertWithoutColumnsWithAllPlaceholders" parameters="1 1 'init'">

    <parser-result sql-case-id="assertInsertWithoutColumnsWithAllPlaceholders" parameters="1, 1, 'init'">

        <tables>

            <table name="t_order" />

        </tables>
@@ -377,7 +377,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertWithoutColumnsWithPartialPlaceholder" parameters="1 1">

    <parser-result sql-case-id="assertInsertWithoutColumnsWithPartialPlaceholder" parameters="1, 1">

        <tables>

            <table name="t_order" />

        </tables>
@@ -405,7 +405,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertWithoutColumnsWithGenerateKeyColumn" parameters="10000 1000 10">

    <parser-result sql-case-id="assertInsertWithoutColumnsWithGenerateKeyColumn" parameters="10000, 1000, 10">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -439,7 +439,7 @@ 
        </or-condition>

    </parser-result>



    <parser-result sql-case-id="assertInsertWithoutColumnsWithoutGenerateKeyColumn" parameters="1000 10">

    <parser-result sql-case-id="assertInsertWithoutColumnsWithoutGenerateKeyColumn" parameters="1000, 10">

        <tables>

            <table name="t_order_item" />

        </tables>

sharding-core/src/test/resources/parser/select.xml

+18 −18
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="select_not_in_with_single_table" parameters="100000 100001">

    <parser-result sql-case-id="select_not_in_with_single_table" parameters="100000, 100001">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -38,7 +38,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="select_not_between_with_single_table" parameters="100000 100001">

    <parser-result sql-case-id="select_not_between_with_single_table" parameters="100000, 100001">

        <tables>

            <table name="t_order_item" />

        </tables>
@@ -50,7 +50,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectEqualsWithSingleTable" parameters="1 1">

    <parser-result sql-case-id="assertSelectEqualsWithSingleTable" parameters="1, 1">

        <tables>

            <table name="t_order" />

        </tables>
@@ -70,7 +70,7 @@ 
    </parser-result>



    <!-- // TODO 这里可优化，将两个字段AND = 替换为永false, 目前因为condition是map，同样的column会覆盖 -->

    <parser-result sql-case-id="assertSelectEqualsWithSameShardingColumns" parameters="1 2">

    <parser-result sql-case-id="assertSelectEqualsWithSameShardingColumns" parameters="1, 2">

        <tables>

            <table name="t_order" />

        </tables>
@@ -89,7 +89,7 @@ 
        </or-condition>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectBetweenWithSingleTable" parameters="1 10 2 5">

    <parser-result sql-case-id="assertSelectBetweenWithSingleTable" parameters="1, 10, 2, 5">

        <tables>

            <table name="t_order" />

        </tables>
@@ -114,7 +114,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectInWithSingleTable" parameters="1 2 3 9 10">

    <parser-result sql-case-id="assertSelectInWithSingleTable" parameters="1, 2, 3, 9, 10">

        <tables>

            <table name="t_order" />

        </tables>
@@ -141,7 +141,7 @@ 
    </parser-result>

    

    <!-- // TODO 目前对于IN多结果不同做到交集处理 仅仅是简单的加入, 目前因为condition是map，同样的column会覆盖 -->

    <parser-result sql-case-id="assertSelectInWithSameShardingColumns" parameters="100 1001 1001 1002">

    <parser-result sql-case-id="assertSelectInWithSameShardingColumns" parameters="100, 1001, 1001, 1002">

        <tables>

            <table name="t_order" />

        </tables>
@@ -165,7 +165,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectIterator" parameters="1 2">

    <parser-result sql-case-id="assertSelectIterator" parameters="1, 2">

        <tables>

            <table name="t_order_item" alias="t"/>

        </tables>
@@ -196,7 +196,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectLikeWithCount" parameters="'init' 1 2 9 10">

    <parser-result sql-case-id="assertSelectLikeWithCount" parameters="'init', 1, 2, 9, 10">

        <tables>

            <table name="t_order" alias="o"/>

        </tables>
@@ -220,7 +220,7 @@ 
        </aggregation-select-items>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectWithBindingTable" parameters="1 2 9 10">

    <parser-result sql-case-id="assertSelectWithBindingTable" parameters="1, 2, 9, 10">

        <tables>

            <table name="t_order" alias="o"/>

            <table name="t_order_item" alias="i"/>
@@ -246,7 +246,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectWithBindingTableAndConfigTable" parameters="1 2 9 10 'init'">

    <parser-result sql-case-id="assertSelectWithBindingTableAndConfigTable" parameters="1, 2, 9, 10, 'init'">

        <tables>

            <table name="t_order" alias="o"/>

            <table name="t_order_item" alias="i"/>
@@ -272,7 +272,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectWithUpperCaseBindingTable" parameters="1 2 9 10">

    <parser-result sql-case-id="assertSelectWithUpperCaseBindingTable" parameters="1, 2, 9, 10">

        <tables>

            <table name="T_ORDER" alias="o"/>

            <table name="T_order_item" alias="i"/>
@@ -298,7 +298,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectWithUpperCaseBindingTableAndConfigTable" parameters="1 2 9 10 'init'">

    <parser-result sql-case-id="assertSelectWithUpperCaseBindingTableAndConfigTable" parameters="1, 2, 9, 10, 'init'">

        <tables>

            <table name="T_ORDER" alias="o"/>

            <table name="T_order_item" alias="i"/>
@@ -324,7 +324,7 @@ 
        </order-by-columns>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectCountWithBindingTable" parameters="1 2 9 10">

    <parser-result sql-case-id="assertSelectCountWithBindingTable" parameters="1, 2, 9, 10">

        <tables>

            <table name="t_order" alias="o"/>

            <table name="t_order_item" alias="i"/>
@@ -350,7 +350,7 @@ 
        </aggregation-select-items>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectCountWithBindingTableWithJoin" parameters="1 2 9 10">

    <parser-result sql-case-id="assertSelectCountWithBindingTableWithJoin" parameters="1, 2, 9, 10">

        <tables>

            <table name="t_order" alias="o"/>

            <table name="t_order_item" alias="i"/>
@@ -410,7 +410,7 @@ 
            </and-condition>

        </or-condition>

    </parser-result>

    <parser-result sql-case-id="assertSelectEqualsWithJsonAnGeo" parameters="'{&quot;rule2&quot;:&quot;null2&quot;}' 100 200 1">

    <parser-result sql-case-id="assertSelectEqualsWithJsonAnGeo" parameters="'{&quot;rule2&quot;:&quot;null2&quot;}', 100, 200, 1">

        <tables>

            <table name="t_place" />

        </tables>
@@ -425,7 +425,7 @@ 
            </and-condition>

        </or-condition>

    </parser-result>

    <parser-result sql-case-id="assertSelectInWithJsonAnGeo" parameters="'{&quot;rule2&quot;:&quot;null2&quot;}' '{&quot;rule3&quot;:&quot;null3&quot;}' 100 200 1">

    <parser-result sql-case-id="assertSelectInWithJsonAnGeo" parameters="'{&quot;rule2&quot;:&quot;null2&quot;}', '{&quot;rule3&quot;:&quot;null3&quot;}', 100, 200, 1">

        <tables>

            <table name="t_place" />

        </tables>
@@ -440,7 +440,7 @@ 
            </and-condition>

        </or-condition>

    </parser-result>

    <parser-result sql-case-id="assertSelectBetweenWithJsonAnGeo" parameters="'{&quot;rule2&quot;:&quot;null2&quot;}' '{&quot;rule3&quot;:&quot;null3&quot;}' 100 200 1">

    <parser-result sql-case-id="assertSelectBetweenWithJsonAnGeo" parameters="'{&quot;rule2&quot;:&quot;null2&quot;}', '{&quot;rule3&quot;:&quot;null3&quot;}', 100, 200, 1">

        <tables>

            <table name="t_place" />

        </tables>

sharding-core/src/test/resources/parser/select_expression.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
        </aggregation-select-items>

    </parser-result>

    

    <parser-result sql-case-id="assertSelectRegexpWithSingleTable" parameters="'init' 1 2">

    <parser-result sql-case-id="assertSelectRegexpWithSingleTable" parameters="'init', 1, 2">

        <tables>

            <table name="t_order_item" alias="t"/>

        </tables>