Commit fad0436a authored by terrymanu's avatar terrymanu
Browse files

fix #496

parent b94b371e

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/token/TableToken.java

+1 −1
Original line number Diff line number Diff line
@@ -42,6 +42,6 @@ public final class TableToken implements SQLToken { 
     * @return table name

     */

    public String getTableName() {

        return SQLUtil.getExactlyValue(originalLiterals);

        return SQLUtil.getExactlyValue(originalLiterals).toLowerCase();

    }

}

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/jaxb/helper/ParserAssertHelper.java

+6 −1
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ import java.util.Iterator; 
import java.util.LinkedList;

import java.util.List;



import static org.hamcrest.core.Is.is;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertTrue;



public class ParserAssertHelper {
@@ -90,7 +92,10 @@ public class ParserAssertHelper { 
        Iterator<io.shardingjdbc.core.parsing.parser.jaxb.SQLToken> sqlTokenIterator = filteredSqlTokens.iterator();

        for (SQLToken each : actual) {

            SQLToken sqlToken = buildExpectedSQLToken(sqlTokenIterator.next(), isPreparedStatement);

            assertTrue(EqualsBuilder.reflectionEquals(sqlToken, each));

            assertTrue(EqualsBuilder.reflectionEquals(sqlToken, each, "originalLiterals"));

            if (sqlToken instanceof TableToken) {

                assertThat(((TableToken) each).getTableName(), is(((TableToken) sqlToken).getTableName()));

            }

        }

        assertFalse(sqlTokenIterator.hasNext());

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ 
    </assert>

    <assert id="assertSelectWithBindingTable" parameters="1,2,9,10">

        <tables>

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

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

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

        </tables>

        <table-tokens>

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    <sql id="assertSelectIterator" value="SELECT t.* FROM t_order_item t WHERE t.item_id IN (%s, %s)" />

    <sql id="assertSelectNoShardingTable" value="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id ORDER BY i.item_id" />

    <sql id="assertSelectLikeWithCount" value="SELECT count(0) as orders_count FROM `t_order` o WHERE o.status LIKE CONCAT('%%', %s, '%%') AND o.`user_id` IN (%s, %s) AND o.`order_id` BETWEEN %s AND %s" type="MySQL,H2" />

    <sql id="assertSelectWithBindingTable" value="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id WHERE o.user_id IN (%s, %s) AND o.order_id BETWEEN %s AND %s ORDER BY i.item_id" />

    <sql id="assertSelectWithBindingTable" value="SELECT i.* FROM T_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id WHERE o.user_id IN (%s, %s) AND o.order_id BETWEEN %s AND %s ORDER BY i.item_id" />

    <sql id="assertSelectWithBindingTableAndConfigTable" value="SELECT i.* FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id JOIN t_config c ON o.status = c.status WHERE o.user_id IN (%s, %s) AND o.order_id BETWEEN %s AND %s AND c.status = %s ORDER BY i.item_id" />

    <sql id="assertSelectCountWithBindingTable" value="SELECT COUNT(*) AS items_count FROM t_order o, t_order_item i WHERE o.user_id = i.user_id AND o.order_id = i.order_id AND o.user_id IN (%s, %s) AND o.order_id BETWEEN %s AND %s" />

    <sql id="assertSelectCountWithBindingTableWithJoin" value="SELECT COUNT(*) AS items_count FROM t_order o JOIN t_order_item i ON o.user_id = i.user_id AND o.order_id = i.order_id WHERE o.user_id IN (%s, %s) AND o.order_id BETWEEN %s AND %s" />