Merge pull request #744 from ma-xiao-guang-64/dev

Fix some bug for test case in mysql(修复在mysql测试用例的bug)

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

@@ -411,9 +411,9 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token begin-position="20" original-literals="t_order" />
-            <table-token begin-position="60" original-literals="t_order_item" />
-            <index-token begin-position="42" original-literals="order_index" table-name="t_order" />
+            <table-token begin-position="16" original-literals="t_order" />
+            <table-token begin-position="56" original-literals="t_order_item" />
+            <index-token begin-position="38" original-literals="order_index" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>

sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/db/expect/select/SelectOne.xml

 <dataset>
     <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
 </dataset>

sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/dbtbl/expect/select/SelectOne.xml

 <dataset>
     <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
 </dataset>

sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/masterslave/expect/select/SelectOne.xml

 <dataset>
     <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
-    <t_order a="1" />
 </dataset>

sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/SelectOne.xml

 <dataset>
-    <t_order a="1" />
+    <a a="1" />
 </dataset>

sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/SelectWithJoinForceIndex.xml

+<dataset>
+    <t_order item_id="100000" order_id="1000" user_id="10" status="init" c_date="2017-08-08" />
+    <t_order item_id="100001" order_id="1000" user_id="10" status="init" c_date="2017-08-08" />
+    <t_order item_id="110000" order_id="1100" user_id="11" status="init" c_date="2017-08-18" />
+    <t_order item_id="110001" order_id="1100" user_id="11" status="init" c_date="2017-08-18" />
+</dataset>

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

@@ -19,7 +19,7 @@
     <sql-case 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-case 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" />
     <sql-case id="assertSelectAliasWithKeyword" value="SELECT length.item_id password FROM t_order_item length where length.item_id = %s " db-types="MySQL,H2,SQLServer,Oracle" />
-    <sql-case id="assertSelectWithJoinForceIndex" value="SELECT o.*,i.* FROM t_order o FORCE INDEX(order_index) JOIN t_order_item i WHERE o.order_id = %s" db-types="MySQL" />
+    <sql-case id="assertSelectWithJoinForceIndex" value="SELECT i.* FROM t_order o FORCE INDEX(order_index) JOIN t_order_item i WHERE o.order_id = %s" db-types="MySQL" />
     <sql-case id="assertSelectEqualsWithJsonAnGeo" value="SELECT * FROM t_place WHERE rule = %s::jsonb AND start_point=ST_GeographyFromText('SRID=4326;POINT('||%s||' '||%s||')') AND user_new_id = %s" db-types="PostgreSQL" />
     <sql-case id="assertSelectInWithJsonAnGeo" value="SELECT * FROM t_place WHERE rule IN (%s::jsonb, %s::jsonb) AND start_point=ST_GeographyFromText('SRID=4326;POINT('||%s||' '||%s||')') AND user_new_id = %s" db-types="PostgreSQL" />
     <sql-case id="assertSelectBetweenWithJsonAnGeo" value="SELECT * FROM t_place WHERE rule BETWEEN %s::jsonb AND %s::jsonb AND start_point=ST_GeographyFromText('SRID=4326;POINT('||%s||' '||%s||')') AND user_new_id = %s" db-types="PostgreSQL" />