Commit 84215e6d authored by haocao's avatar haocao
Browse files

Merge remote-tracking branch 'origin/2.0.0.M1' into 2.0.0.M1

parents d61283cb a55ca64d

sharding-jdbc-core/src/test/resources/parser/select_aggregate.xml

+11 −0
Original line number Diff line number Diff line
@@ -64,4 +64,15 @@ 
            </aggregation-select-item>

        </aggregation-select-items>

    </assert>

    <assert id="assertSelectCountForSpecialSymbol">

        <tables>

            <table name="t_order" />

        </tables>

        <table-tokens>

            <table-token begin-position="46" original-literals="t_order" />

        </table-tokens>

        <aggregation-select-items>

            <aggregation-select-item inner-expression="(`order_id`)" aggregation-type="COUNT" alias="orders_count" />

        </aggregation-select-items>

    </assert>

</asserts>

sharding-jdbc-core/src/test/resources/sql/dql/select_aggregate.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ 
    <sql id="assertSelectMax" value="SELECT MAX(user_id) AS max_user_id FROM t_order" />

    <sql id="assertSelectMin" value="SELECT MIN(user_id) AS min_user_id FROM t_order" />

    <sql id="assertSelectAvg" value="SELECT AVG(user_id) AS user_id_avg FROM t_order" />

    <sql id="assertSelectCountForSpecialSymbol" value="SELECT COUNT(`user_id`) AS orders_count FROM t_order" type="MySQL" />

    <sql id="assertSelectCountForSpecialSymbol" value="SELECT COUNT(`order_id`) AS orders_count FROM t_order" type="MySQL" />

</sqls>