Commit 63c2a2fa authored by terrymanu's avatar terrymanu
Browse files

for #601: add db, dbtbl and masterslave type for select_not_between_with_single_table

parent 0b925721

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

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

    </parser-result>

    

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

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

        <tables>

            <table name="t_order_item" />

        </tables>

sharding-jdbc/src/test/resources/asserts/cases/select/dataset/select_not_in_with_single_table.xml

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
<datasets>

    <columns values="item_id, order_id, user_id, status, c_date" />

    <dataset values="100100, 1001, 10, init, 2017-08-08" />

    <dataset values="100101, 1001, 10, init, 2017-08-08" />

    <dataset values="100200, 1002, 10, init, 2017-08-08" />

    <dataset values="100201, 1002, 10, init, 2017-08-08" />

    <dataset values="100300, 1003, 10, init, 2017-08-08" />

    <dataset values="100301, 1003, 10, init, 2017-08-08" />

    <dataset values="100400, 1004, 10, init, 2017-08-08" />

    <dataset values="100401, 1004, 10, init, 2017-08-08" />

    <dataset values="100500, 1005, 10, init, 2017-08-09" />

    <dataset values="100501, 1005, 10, init, 2017-08-09" />

    <dataset values="100600, 1006, 10, init, 2017-08-09" />

    <dataset values="100601, 1006, 10, init, 2017-08-09" />

    <dataset values="100700, 1007, 10, init, 2017-08-09" />

    <dataset values="100701, 1007, 10, init, 2017-08-09" />

    <dataset values="100800, 1008, 10, init, 2017-08-09" />

    <dataset values="100801, 1008, 10, init, 2017-08-09" />

    <dataset values="100900, 1009, 10, init, 2017-08-09" />

    <dataset values="100901, 1009, 10, init, 2017-08-09" />

    <dataset values="110000, 1100, 11, init, 2017-08-18" />

    <dataset values="110001, 1100, 11, init, 2017-08-18" />

    <dataset values="110100, 1101, 11, init, 2017-08-18" />

    <dataset values="110101, 1101, 11, init, 2017-08-18" />

    <dataset values="110200, 1102, 11, init, 2017-08-18" />

    <dataset values="110201, 1102, 11, init, 2017-08-18" />

    <dataset values="110300, 1103, 11, init, 2017-08-18" />

    <dataset values="110301, 1103, 11, init, 2017-08-18" />

    <dataset values="110400, 1104, 11, init, 2017-08-18" />

    <dataset values="110401, 1104, 11, init, 2017-08-18" />

    <dataset values="110500, 1105, 11, init, 2017-08-19" />

    <dataset values="110501, 1105, 11, init, 2017-08-19" />

    <dataset values="110600, 1106, 11, init, 2017-08-19" />

    <dataset values="110601, 1106, 11, init, 2017-08-19" />

    <dataset values="110700, 1107, 11, init, 2017-08-19" />

    <dataset values="110701, 1107, 11, init, 2017-08-19" />

    <dataset values="110800, 1108, 11, init, 2017-08-19" />

    <dataset values="110801, 1108, 11, init, 2017-08-19" />

    <dataset values="110900, 1109, 11, init, 2017-08-19" />

    <dataset values="110901, 1109, 11, init, 2017-08-19" />

</datasets>

sharding-jdbc/src/test/resources/asserts/cases/select/dql-integrate-test-cases.xml

+5 −2
Original line number Diff line number Diff line
@@ -27,8 +27,11 @@ 
        <assertion sharding-rule-type="masterslave" parameters="100000:int, 100001:int" expected-data-file="masterslave/select_not_in_with_single_table.xml" />

    </dql-test-case>

    

    <dql-test-case sql-case-id="assertSelectNotEqualsWithSingleTableForNotBetween">

        <assertion sharding-rule-type="tbl" parameters="100000:int, 100001:int" expected-data-file="select_not_in_with_single_table.xml" />

    <dql-test-case sql-case-id="select_not_between_with_single_table">

        <assertion sharding-rule-type="db" parameters="100000:int, 100001:int" expected-data-file="db/select_not_in_with_single_table.xml" />

        <assertion sharding-rule-type="tbl" parameters="100000:int, 100001:int" expected-data-file="tbl/select_not_in_with_single_table.xml" />

        <assertion sharding-rule-type="dbtbl" parameters="100000:int, 100001:int" expected-data-file="dbtbl/select_not_in_with_single_table.xml" />

        <assertion sharding-rule-type="masterslave" parameters="100000:int, 100001:int" expected-data-file="masterslave/select_not_in_with_single_table.xml" />

    </dql-test-case>

    

    <dql-test-case sql-case-id="assertSelectEqualsWithSameShardingColumns">

sharding-jdbc/src/test/resources/integrate/assert/select.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
            <data parameter="100000,100001" expected="select/SelectNotWithSingleTable.xml" />

        </sharding-rule>

    </sql>

    <sql id="assertSelectNotEqualsWithSingleTableForNotBetween">

    <sql id="select_not_between_with_single_table">

        <sharding-rule value="tbl">

            <data parameter="100000,100001" expected="select/SelectNotWithSingleTable.xml" />

        </sharding-rule>

sharding-sql-test/src/main/resources/sql/dql/select.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    <sql-case id="select_not_equal_with_single_table" value="SELECT * FROM t_order_item WHERE item_id &lt;&gt; %s ORDER BY item_id" />

    <sql-case id="select_exclamation_equal_with_single_table" value="SELECT * FROM t_order_item WHERE item_id != %s ORDER BY item_id" />

    <sql-case id="select_not_in_with_single_table" value="SELECT * FROM t_order_item WHERE item_id IS NOT NULL AND item_id NOT IN (%s, %s) ORDER BY item_id" />

    <sql-case id="assertSelectNotEqualsWithSingleTableForNotBetween" value="SELECT * FROM t_order_item WHERE item_id IS NOT NULL AND item_id NOT BETWEEN %s AND %s ORDER BY item_id" />

    <sql-case id="select_not_between_with_single_table" value="SELECT * FROM t_order_item WHERE item_id IS NOT NULL AND item_id NOT BETWEEN %s AND %s ORDER BY item_id" />

    <sql-case id="assertSelectEqualsWithSingleTable" value="SELECT * FROM t_order WHERE user_id = %s AND order_id = %s" />

    <sql-case id="assertSelectEqualsWithSameShardingColumns" value="SELECT * FROM t_order WHERE order_id = %s AND order_id = %s" />

    <sql-case id="assertSelectBetweenWithSingleTable" value="SELECT * FROM t_order WHERE user_id BETWEEN %s AND %s AND order_id BETWEEN %s AND %s ORDER BY user_id, order_id" />