From 75fb5232292bfb059aada2aa9654a2b1e4c60306 Mon Sep 17 00:00:00 2001
From: terrymanu <terrymanu@163.com>
Date: Fri, 8 Jun 2018 12:09:08 +0800
Subject: [PATCH] for #601: select_equal_with_same_sharding_column

---
 sharding-core/src/test/resources/parser/select.xml         | 5 ++---
 .../select/dataset/SelectEqualsWithSameShardingColumns.xml | 3 ---
 .../asserts/cases/select/dql-integrate-test-cases.xml      | 7 +++++--
 .../src/test/resources/integrate/assert/select.xml         | 2 +-
 sharding-sql-test/src/main/resources/sql/dql/select.xml    | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 sharding-jdbc/src/test/resources/asserts/cases/select/dataset/SelectEqualsWithSameShardingColumns.xml

diff --git a/sharding-core/src/test/resources/parser/select.xml b/sharding-core/src/test/resources/parser/select.xml
index 1125307608..f1b35648ce 100644
--- a/sharding-core/src/test/resources/parser/select.xml
+++ b/sharding-core/src/test/resources/parser/select.xml
@@ -68,9 +68,8 @@
             </and-condition>
         </or-condition>
     </parser-result>
-
-    <!-- // TODO 这里可优化，将两个字段AND = 替换为永false, 目前因为condition是map，同样的column会覆盖 -->
-    <parser-result sql-case-id="assertSelectEqualsWithSameShardingColumns" parameters="1, 2">
+    
+    <parser-result sql-case-id="select_equal_with_same_sharding_column" parameters="1, 2">
         <tables>
             <table name="t_order" />
         </tables>
diff --git a/sharding-jdbc/src/test/resources/asserts/cases/select/dataset/SelectEqualsWithSameShardingColumns.xml b/sharding-jdbc/src/test/resources/asserts/cases/select/dataset/SelectEqualsWithSameShardingColumns.xml
deleted file mode 100644
index d490bba9c6..0000000000
--- a/sharding-jdbc/src/test/resources/asserts/cases/select/dataset/SelectEqualsWithSameShardingColumns.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<datasets>
-    <columns values="order_id, user_id, status" />
-</datasets>
diff --git a/sharding-jdbc/src/test/resources/asserts/cases/select/dql-integrate-test-cases.xml b/sharding-jdbc/src/test/resources/asserts/cases/select/dql-integrate-test-cases.xml
index 574082b3ed..5770b52cd8 100644
--- a/sharding-jdbc/src/test/resources/asserts/cases/select/dql-integrate-test-cases.xml
+++ b/sharding-jdbc/src/test/resources/asserts/cases/select/dql-integrate-test-cases.xml
@@ -45,8 +45,11 @@
         <assertion sharding-rule-type="masterslave" parameters="12:int, 1000:int" expected-data-file="empty_result.xml" />
     </dql-test-case>
     
-    <dql-test-case sql-case-id="assertSelectEqualsWithSameShardingColumns">
-        <assertion sharding-rule-type="tbl" parameters="1000:int, 1001:int" expected-data-file="SelectEqualsWithSameShardingColumns.xml" />
+    <dql-test-case sql-case-id="select_equal_with_same_sharding_column">
+        <assertion sharding-rule-type="db" parameters="1000:int, 1001:int" expected-data-file="empty_result.xml" />
+        <assertion sharding-rule-type="tbl" parameters="1000:int, 1001:int" expected-data-file="empty_result.xml" />
+        <assertion sharding-rule-type="dbtbl" parameters="1000:int, 1001:int" expected-data-file="empty_result.xml" />
+        <assertion sharding-rule-type="masterslave" parameters="1000:int, 1001:int" expected-data-file="empty_result.xml" />
     </dql-test-case>
     
     <dql-test-case sql-case-id="assertSelectInWithSameShardingColumns">
diff --git a/sharding-jdbc/src/test/resources/integrate/assert/select.xml b/sharding-jdbc/src/test/resources/integrate/assert/select.xml
index 71cecb2c00..f70ea85553 100644
--- a/sharding-jdbc/src/test/resources/integrate/assert/select.xml
+++ b/sharding-jdbc/src/test/resources/integrate/assert/select.xml
@@ -25,7 +25,7 @@
             <data parameter="100000,100001" expected="select/SelectNotWithSingleTable.xml" />
         </sharding-rule>
     </sql>
-    <sql id="assertSelectEqualsWithSameShardingColumns">
+    <sql id="select_equal_with_same_sharding_column">
         <sharding-rule value="tbl">
             <data parameter="1000,1001" />
         </sharding-rule>
diff --git a/sharding-sql-test/src/main/resources/sql/dql/select.xml b/sharding-sql-test/src/main/resources/sql/dql/select.xml
index 4b90d6838a..0a003c83b6 100644
--- a/sharding-sql-test/src/main/resources/sql/dql/select.xml
+++ b/sharding-sql-test/src/main/resources/sql/dql/select.xml
@@ -6,7 +6,7 @@
     <sql-case id="select_not_in_with_single_table" value="SELECT * FROM t_order_item WHERE item_id IS NOT NULL AND item_id NOT IN (%s, %s) ORDER BY item_id" />
     <sql-case id="select_not_between_with_single_table" value="SELECT * FROM t_order_item WHERE item_id IS NOT NULL AND item_id NOT BETWEEN %s AND %s ORDER BY item_id" />
     <sql-case id="select_equal_with_single_table" value="SELECT * FROM t_order WHERE user_id = %s AND order_id = %s" />
-    <sql-case id="assertSelectEqualsWithSameShardingColumns" value="SELECT * FROM t_order WHERE order_id = %s AND order_id = %s" />
+    <sql-case id="select_equal_with_same_sharding_column" value="SELECT * FROM t_order WHERE order_id = %s AND order_id = %s" />
     <sql-case id="assertSelectBetweenWithSingleTable" value="SELECT * FROM t_order WHERE user_id BETWEEN %s AND %s AND order_id BETWEEN %s AND %s ORDER BY user_id, order_id" />
     <sql-case id="assertSelectInWithSingleTable" value="SELECT * FROM t_order WHERE user_id IN (%s, %s, %s) AND order_id IN (%s, %s) ORDER BY user_id, order_id" />
     <sql-case id="assertSelectInWithSameShardingColumns" value="SELECT * FROM t_order WHERE order_id IN (%s, %s) AND order_id IN (%s, %s) ORDER BY order_id" />
-- 
GitLab