From a35f887a6eebf17a1a32a43c0beb89a9f710b90d Mon Sep 17 00:00:00 2001
From: terrymanu <terrymanu@163.com>
Date: Wed, 17 Jan 2018 16:35:46 +0800
Subject: [PATCH] add test case for #557

---
 .../integrate/assert/select_group_by.xml      |  5 +++++
 ...AliasAndMismatchOrderByAndGroupByItems.xml | 22 +++++++++++++++++++
 ...AliasAndMismatchOrderByAndGroupByItems.xml | 22 +++++++++++++++++++
 ...AliasAndMismatchOrderByAndGroupByItems.xml | 12 ++++++++++
 ...AliasAndMismatchOrderByAndGroupByItems.xml | 12 ++++++++++
 ...AliasAndMismatchOrderByAndGroupByItems.xml |  4 ++++
 .../resources/sql/dql/select_group_by.xml     |  1 +
 7 files changed, 78 insertions(+)
 create mode 100644 sharding-jdbc-core/src/test/resources/integrate/dataset/masterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
 create mode 100644 sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/db/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
 create mode 100644 sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/dbtbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
 create mode 100644 sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/masterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
 create mode 100644 sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml

diff --git a/sharding-jdbc-core/src/test/resources/integrate/assert/select_group_by.xml b/sharding-jdbc-core/src/test/resources/integrate/assert/select_group_by.xml
index afc2d9bb23cab..7909a1a49818a 100644
--- a/sharding-jdbc-core/src/test/resources/integrate/assert/select_group_by.xml
+++ b/sharding-jdbc-core/src/test/resources/integrate/assert/select_group_by.xml
@@ -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" />
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/masterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/masterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
new file mode 100644
index 0000000000000..bf7e0638c627a
--- /dev/null
+++ b/sharding-jdbc-core/src/test/resources/integrate/dataset/masterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
@@ -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>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/db/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/db/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
new file mode 100644
index 0000000000000..085f772519f0d
--- /dev/null
+++ b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/db/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
@@ -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>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/dbtbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/dbtbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
new file mode 100644
index 0000000000000..231095a74ec5a
--- /dev/null
+++ b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/dbtbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
@@ -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>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/masterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/masterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
new file mode 100644
index 0000000000000..231095a74ec5a
--- /dev/null
+++ b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/masterslave/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
@@ -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>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
new file mode 100644
index 0000000000000..219dc32da8b0d
--- /dev/null
+++ b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select_group_by/SelectItemWithAliasAndMismatchOrderByAndGroupByItems.xml
@@ -0,0 +1,4 @@
+<dataset>
+    <t_order uid="10" GROUP_BY_DERIVED_0="10" />
+    <t_order uid="11" GROUP_BY_DERIVED_0="11" />
+</dataset>
diff --git a/sharding-jdbc-core/src/test/resources/sql/dql/select_group_by.xml b/sharding-jdbc-core/src/test/resources/sql/dql/select_group_by.xml
index f2f9c1e1e8154..f7bfe7cae725c 100644
--- a/sharding-jdbc-core/src/test/resources/sql/dql/select_group_by.xml
+++ b/sharding-jdbc-core/src/test/resources/sql/dql/select_group_by.xml
@@ -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>