Commit a2b3ab0c authored by haocao's avatar haocao
Browse files

Fixed wrong spelling words for parser test case.

parent 1cdba6ad

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/AbstractBaseParseTest.java

+23 −7
Original line number Diff line number Diff line
@@ -214,15 +214,20 @@ public abstract class AbstractBaseParseTest { 
    }

    

    protected final void assertSQLStatement(final SQLStatement actual) {

        assertTrue(new ReflectionEquals(expectedTables).matches(actual.getTables()));

        assertTrue(new ReflectionEquals(expectedConditions).matches(actual.getConditions()));

        assertExpectedTables(actual);

        assertExpectedConditions(actual);

        assertOrderBy(actual);

        for (GroupBy each : actual.getGroupByList()) {

            assertTrue(new ReflectionEquals(groupByColumns.next()).matches(each));

        }

        assertFalse(groupByColumns.hasNext());

        assertGroupBy(actual);

//        assertAggregationSelectItem(actual);

        assertTrue(new ReflectionEquals(limit).matches(actual.getLimit()));

        assertLimit(actual);

    }

    

    private void assertExpectedTables(final SQLStatement actual) {

        assertTrue(new ReflectionEquals(expectedTables).matches(actual.getTables()));

    }

    

    private void assertExpectedConditions(SQLStatement actual) {

        assertTrue(new ReflectionEquals(expectedConditions).matches(actual.getConditions()));

    }

    

    private void assertOrderBy(final SQLStatement actual) {
@@ -232,6 +237,13 @@ public abstract class AbstractBaseParseTest { 
        assertFalse(orderByColumns.hasNext());

    }

    

    private void assertGroupBy(SQLStatement actual) {

        for (GroupBy each : actual.getGroupByList()) {

            assertTrue(new ReflectionEquals(groupByColumns.next()).matches(each));

        }

        assertFalse(groupByColumns.hasNext());

    }

    

    private void assertAggregationSelectItem(final SQLStatement actual) {

        for (AggregationSelectItem each : actual.getAggregationSelectItems()) {

            AggregationSelectItem expected = aggregationSelectItems.next();
@@ -243,4 +255,8 @@ public abstract class AbstractBaseParseTest { 
        }

        assertFalse(aggregationSelectItems.hasNext());

    }

    

    private void assertLimit(SQLStatement actual) {

        assertTrue(new ReflectionEquals(limit).matches(actual.getLimit()));

    }

}

sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parsing/mysql/statement/delete.xml

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

<asserts>

    <assert id="assertDelete" sql="DELETE FROM `order` WHERE order_id IN (1, 2, 3)" expected-sql="DELETE FROM [Token(order)] WHERE order_id IN (1, 2, 3)">

    <assert id="assertDelete" sql="DELETE FROM `order` WHERE order_id IN (1, 2, 3)">

        <tables>

            <table name="order" />

        </tables>
@@ -13,7 +13,7 @@ 
        </conditions>

    </assert>

    

    <assert id="assertDeleteWithAlias" sql="DELETE FROM `order` o WHERE order_id BETWEEN 1 AND 3" expected-sql="DELETE FROM [Token(order)] o WHERE order_id BETWEEN 1 AND 3">

    <assert id="assertDeleteWithAlias" sql="DELETE FROM `order` o WHERE order_id BETWEEN 1 AND 3">

        <tables>

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

        </tables>

sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parsing/mysql/statement/insert.xml

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

<asserts>

    <assert id="assertInsert" sql="insert into `order`('order_id','state') values (1,'RUNNING')" expected-sql="insert into [Token(order)]('order_id','state') values (1,'RUNNING')">

    <assert id="assertInsert" sql="insert into `order`('order_id','state') values (1,'RUNNING')">

        <tables>

            <table name="order" />

        </tables>
@@ -14,7 +14,7 @@ 
        </conditions>

    </assert>

    

    <assert id="assertInsertWithGenerateKeyColumn" sql="insert into `order`('state') values('RUNNING')" expected-sql="insert into [Token(order)]('state', order_id) values('RUNNING', 1)">

    <assert id="assertInsertWithGenerateKeyColumn" sql="insert into `order`('state') values('RUNNING')">

        <tables>

            <table name="order" />

        </tables>
@@ -25,7 +25,7 @@ 
        </conditions>

    </assert>

    

    <assert id="assertInsertWithoutGenerateKeyColumn" sql="insert into `user`('user_id', 'state') values(1, 'RUNNING')" expected-sql="insert into [Token(user)]('user_id', 'state') values(1, 'RUNNING')">

    <assert id="assertInsertWithoutGenerateKeyColumn" sql="insert into `user`('user_id', 'state') values(1, 'RUNNING')">

        <tables>

            <table name="user" />

        </tables>

sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parsing/mysql/statement/multiple_tables_select.xml

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

<asserts>

    <assert id="assertSelectWithRelationship" sql="SELECT * FROM user u, order o, order_item i WHERE u.user_id = o.user_id AND o.order_id = i.order_id AND u.user_id = 1000" expected-sql="SELECT * FROM [Token(user)] u, [Token(order)] o, [Token(order_item)] i WHERE u.user_id = o.user_id AND o.order_id = i.order_id AND u.user_id = 1000">

    <assert id="assertSelectWithRelationship" sql="SELECT * FROM user u, order o, order_item i WHERE u.user_id = o.user_id AND o.order_id = i.order_id AND u.user_id = 1000">

        <tables>

            <table name="user" alias="u" />

            <table name="order" alias="o" />
@@ -13,7 +13,7 @@ 
        </conditions>

    </assert>

    

    <assert id="assertSelectWithJoin" sql="SELECT * FROM order INNER JOIN user u ON u.user_id = order.user_id JOIN order_item i ON u.user_id = i.user_id WHERE u.user_id = 1000" expected-sql="SELECT * FROM [Token(order)] INNER JOIN [Token(user)] u ON u.user_id = [Token(order)].user_id JOIN [Token(order_item)] i ON u.user_id = i.user_id WHERE u.user_id = 1000">

    <assert id="assertSelectWithJoin" sql="SELECT * FROM order INNER JOIN user u ON u.user_id = order.user_id JOIN order_item i ON u.user_id = i.user_id WHERE u.user_id = 1000">

        <tables>

            <table name="order" />

            <table name="user" alias="u" />
@@ -26,7 +26,7 @@ 
        </conditions>

    </assert>

    

    <assert id="assertSelectWithJoinUsing" sql="SELECT * FROM user u JOIN order o USING(user_id) JOIN order_item USING(user_id) WHERE u.user_id = 1000" expected-sql="SELECT * FROM [Token(user)] u JOIN [Token(order)] o USING(user_id) JOIN [Token(order_item)] USING(user_id) WHERE u.user_id = 1000">

    <assert id="assertSelectWithJoinUsing" sql="SELECT * FROM user u JOIN order o USING(user_id) JOIN order_item USING(user_id) WHERE u.user_id = 1000">

        <tables>

            <table name="user" alias="u" />

            <table name="order" alias="o" />
@@ -39,7 +39,7 @@ 
        </conditions>

    </assert>

    

    <assert id="assertSelectAmbiguousTableName" sql="SELECT * FROM user u JOIN order o USING(user_id) JOIN order_item USING(user_id) WHERE u.user_id = 1000" expected-sql="SELECT * FROM [Token(user)] u JOIN [Token(order)] o USING(user_id) JOIN [Token(order_item)] USING(user_id) WHERE u.user_id = 1000">

    <assert id="assertSelectAmbiguousTableName" sql="SELECT * FROM user u JOIN order o USING(user_id) JOIN order_item USING(user_id) WHERE u.user_id = 1000">

        <tables>

            <table name="user" alias="u" />

            <table name="order" alias="o" />
@@ -53,7 +53,7 @@ 
    </assert>

    

    <!-- // TODO 目前无法在条件中解析出来不同子关联对应的条件 -->

    <assert id="assertSelectWithSelfJoin" sql="SELECT * FROM order, order_item WHERE order_id = 1" expected-sql="SELECT * FROM [Token(order)], [Token(order_item)] WHERE order_id = 1">

    <assert id="assertSelectWithSelfJoin" sql="SELECT * FROM order, order_item WHERE order_id = 1">

        <tables>

            <table name="order" />

            <table name="order_item" />

sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parsing/mysql/statement/select_aggregate.xml

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

<asserts>

    <assert id="assertSelectWithCountAndMaxAndMin" sql="SELECT COUNT(MAX(*)) AS c, order_id , MAX(MIN(date)), MIN(time) Time FROM order WHERE order_id=max(order_id) " expected-sql="SELECT COUNT(MAX(*)) AS c, order_id , MAX(MIN(date)), MIN(time) Time FROM [Token(order)] WHERE order_id=max(order_id) ">

    <assert id="assertSelectWithCountAndMaxAndMin" sql="SELECT COUNT(MAX(*)) AS c, order_id , MAX(MIN(date)), MIN(time) Time FROM order WHERE order_id=max(order_id) ">

        <tables>

            <table name="order"/>

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

    </assert>



    <assert id="assertSelectWithAvg" sql="SELECT AVG(MAX(date)) date, AVG(DISTINCT time), order_id FROM order" expected-sql="SELECT AVG(MAX(date)) date, AVG(DISTINCT time), order_id , COUNT(MAX(date)) AS sharding_gen_1 , SUM(MAX(date)) AS sharding_gen_2 , COUNT(DISTINCT time) AS sharding_gen_3 , SUM(DISTINCT time) AS sharding_gen_4 FROM [Token(order)]">

    <assert id="assertSelectWithAvg" sql="SELECT AVG(MAX(date)) date, AVG(DISTINCT time), order_id FROM order">

        <tables>

            <table name="order"/>

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

    </assert>

    

    <assert id="assertSelectWithAggregateAndGroupBy" sql="SELECT order_id, MAX(date) FROM order GROUP BY order_id" expected-sql="SELECT order_id, MAX(date) FROM [Token(order)] GROUP BY order_id">

    <assert id="assertSelectWithAggregateAndGroupBy" sql="SELECT order_id, MAX(date) FROM order GROUP BY order_id">

        <tables>

            <table name="order"/>

        </tables>
@@ -43,14 +43,14 @@ 
        </aggregation-select-items>

    </assert>

    

    <assert id="assertSelectWithUnsupportedFunction" sql="SELECT id, BIT_OR(date) FROM order" expected-sql="SELECT id, BIT_OR(date) FROM [Token(order)]">

    <assert id="assertSelectWithUnsupportedFunction" sql="SELECT id, BIT_OR(date) FROM order">

        <tables>

            <table name="order"/>

        </tables>

    </assert>

    

    <!-- // TODO 有*时，聚合的偏移量不准确 -->

    <assert id="assertSelectWithStartWithAllAndAggregate" sql="SELECT *, COUNT(time) FROM order" expected-sql="SELECT *, COUNT(time) FROM [Token(order)]">

    <assert id="assertSelectWithStartWithAllAndAggregate" sql="SELECT *, COUNT(time) FROM order">

        <tables>

            <table name="order"/>

        </tables>