Skip to content

Commit

Permalink
add test case for #557
Browse files Browse the repository at this point in the history
  • Loading branch information
@terrymanu
terrymanu committed Jan 17, 2018
1 parent c3e6e39 commit a35f887
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 0 deletions.
5 changes: 5 additions & 0 deletions sharding-jdbc-core/src/test/resources/integrate/assert/select_group_by.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@
<data parameter="0" />
</sharding-rule>
</sql>
<sql id="assertSelectItemWithAliasAndMismatchOrderByAndGroupByItems">
<sharding-rule>
<data expected="select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml" />
</sharding-rule>
</sql>
<sql id="assertSelectGroupByWithAliasIsKeyword">
<sharding-rule>
<data expected="select_group_by/SelectGroupByWithAliasIsKeyword.xml" />
Expand Down
22 changes: 22 additions & 0 deletions ...sterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<dataset>
<t_order uid="10" />
<t_order uid="11" />
<t_order uid="12" />
<t_order uid="13" />
<t_order uid="14" />
<t_order uid="15" />
<t_order uid="16" />
<t_order uid="17" />
<t_order uid="18" />
<t_order uid="19" />
<t_order uid="20" />
<t_order uid="21" />
<t_order uid="22" />
<t_order uid="23" />
<t_order uid="24" />
<t_order uid="25" />
<t_order uid="26" />
<t_order uid="27" />
<t_order uid="28" />
<t_order uid="29" />
</dataset>
22 changes: 22 additions & 0 deletions ...arding/db/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<dataset>
<t_order uid="10" GROUP_BY_DERIVED_0="10" />
<t_order uid="11" GROUP_BY_DERIVED_0="11" />
<t_order uid="12" GROUP_BY_DERIVED_0="12" />
<t_order uid="13" GROUP_BY_DERIVED_0="13" />
<t_order uid="14" GROUP_BY_DERIVED_0="14" />
<t_order uid="15" GROUP_BY_DERIVED_0="15" />
<t_order uid="16" GROUP_BY_DERIVED_0="16" />
<t_order uid="17" GROUP_BY_DERIVED_0="17" />
<t_order uid="18" GROUP_BY_DERIVED_0="18" />
<t_order uid="19" GROUP_BY_DERIVED_0="19" />
<t_order uid="20" GROUP_BY_DERIVED_0="20" />
<t_order uid="21" GROUP_BY_DERIVED_0="21" />
<t_order uid="22" GROUP_BY_DERIVED_0="22" />
<t_order uid="23" GROUP_BY_DERIVED_0="23" />
<t_order uid="24" GROUP_BY_DERIVED_0="24" />
<t_order uid="25" GROUP_BY_DERIVED_0="25" />
<t_order uid="26" GROUP_BY_DERIVED_0="26" />
<t_order uid="27" GROUP_BY_DERIVED_0="27" />
<t_order uid="28" GROUP_BY_DERIVED_0="28" />
<t_order uid="29" GROUP_BY_DERIVED_0="29" />
</dataset>
12 changes: 12 additions & 0 deletions ...ing/dbtbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<dataset>
<t_order uid="10" GROUP_BY_DERIVED_0="10" />
<t_order uid="11" GROUP_BY_DERIVED_0="11" />
<t_order uid="12" GROUP_BY_DERIVED_0="12" />
<t_order uid="13" GROUP_BY_DERIVED_0="13" />
<t_order uid="14" GROUP_BY_DERIVED_0="14" />
<t_order uid="15" GROUP_BY_DERIVED_0="15" />
<t_order uid="16" GROUP_BY_DERIVED_0="16" />
<t_order uid="17" GROUP_BY_DERIVED_0="17" />
<t_order uid="18" GROUP_BY_DERIVED_0="18" />
<t_order uid="19" GROUP_BY_DERIVED_0="19" />
</dataset>
12 changes: 12 additions & 0 deletions ...sterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<dataset>
<t_order uid="10" GROUP_BY_DERIVED_0="10" />
<t_order uid="11" GROUP_BY_DERIVED_0="11" />
<t_order uid="12" GROUP_BY_DERIVED_0="12" />
<t_order uid="13" GROUP_BY_DERIVED_0="13" />
<t_order uid="14" GROUP_BY_DERIVED_0="14" />
<t_order uid="15" GROUP_BY_DERIVED_0="15" />
<t_order uid="16" GROUP_BY_DERIVED_0="16" />
<t_order uid="17" GROUP_BY_DERIVED_0="17" />
<t_order uid="18" GROUP_BY_DERIVED_0="18" />
<t_order uid="19" GROUP_BY_DERIVED_0="19" />
</dataset>
4 changes: 4 additions & 0 deletions ...rding/tbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<dataset>
<t_order uid="10" GROUP_BY_DERIVED_0="10" />
<t_order uid="11" GROUP_BY_DERIVED_0="11" />
</dataset>
1 change: 1 addition & 0 deletions sharding-jdbc-core/src/test/resources/sql/dql/select_group_by.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
<sql id="assertSelectCountWithGroupByBindingTable" value="SELECT count(*) as items_count, o.user_id 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 GROUP BY o.user_id ORDER BY o.user_id" />
<sql id="assertSelectWithGroupByAndLimit" value="SELECT user_id FROM t_order GROUP BY user_id ORDER BY user_id LIMIT %s" type="H2,MySQL,PostgreSQL" />
<sql id="assertSelectWithGroupByAndOrderByAndLimit" value="SELECT user_id, SUM(order_id) FROM t_order GROUP BY user_id ORDER BY SUM(order_id) LIMIT %s" type="H2,MySQL,PostgreSQL" />
<sql id="assertSelectItemWithAliasAndMismatchOrderByAndGroupByItems" value="SELECT o.user_id uid FROM t_order o GROUP BY o.user_id ORDER BY o.user_id" />
<sql id="assertSelectGroupByWithAliasIsKeyword" value="SELECT SUM(order_id) AS orders_sum, user_id as `key` FROM t_order GROUP BY `key`" type="MySQL" />
</sqls>

0 comments on commit a35f887

Please sign in to comment.