Merge pull request #1345 from haocao/dev

for #1316, update test cases.
apache · Oct 17, 2018 · 2852ac9 · 2852ac9
2 parents 3086266 + 024aa62
commit 2852ac9
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 41 deletions.
diff --git a/sharding-core/src/test/resources/parser/delete.xml b/sharding-core/src/test/resources/parser/delete.xml
@@ -33,7 +33,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token begin-position="7" original-literals="`t_order`" />
+            <table-token begin-position="12" original-literals="`t_order`" />
         </tokens>
     </parser-result>
 

diff --git a/sharding-core/src/test/resources/parser/insert.xml b/sharding-core/src/test/resources/parser/insert.xml
@@ -93,8 +93,8 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token begin-position="33" original-literals="`t_order`" />
-            <insert-values-token begin-position="84" table-name="t_order"/>
+            <table-token begin-position="33" original-literals="t_order" />
+            <insert-values-token begin-position="76" table-name="t_order"/>
         </tokens>
         <or-condition>
             <and-condition>

diff --git a/...rding-jdbc-core/src/test/java/io/shardingsphere/dbtest/env/datasource/DataSourceUtil.java b/...rding-jdbc-core/src/test/java/io/shardingsphere/dbtest/env/datasource/DataSourceUtil.java
@@ -78,7 +78,7 @@ private static DataSource createDBCP(final DatabaseType databaseType, final Stri
         result.setUrl(null == dataSourceName ? databaseEnvironment.getURL() : databaseEnvironment.getURL(dataSourceName));
         result.setUsername(databaseEnvironment.getUsername());
         result.setPassword(databaseEnvironment.getPassword());
-        result.setMaxTotal(5);
+        result.setMaxTotal(15);
         result.setValidationQuery("SELECT 1");
         if (DatabaseType.Oracle == databaseType) {
             result.setConnectionInitSqls(Collections.singleton("ALTER SESSION SET CURRENT_SCHEMA = " + dataSourceName));
@@ -93,7 +93,7 @@ private static DataSource createHikariCP(final DatabaseType databaseType, final
         result.setJdbcUrl(null == dataSourceName ? databaseEnvironment.getURL() : databaseEnvironment.getURL(dataSourceName));
         result.setUsername(databaseEnvironment.getUsername());
         result.setPassword(databaseEnvironment.getPassword());
-        result.setMaximumPoolSize(5);
+        result.setMaximumPoolSize(15);
         result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
         result.setConnectionTestQuery("SELECT 1");
         if (DatabaseType.Oracle == databaseType) {

diff --git a/...bc/sharding-jdbc-core/src/test/resources/integrate/cases/dml/dml-integrate-test-cases.xml b/...bc/sharding-jdbc-core/src/test/resources/integrate/cases/dml/dml-integrate-test-cases.xml
@@ -145,7 +145,7 @@
     </dml-test-case>
 
     <dml-test-case sql-case-id="delete_with_special_character_without_sharding_value">
-        <assertion expected-data-file="delete_with_special_character_without_sharding_value.xml" />
+        <assertion expected-data-file="delete_with_sharding_value.xml" />
     </dml-test-case>
 
     <dml-test-case sql-case-id="delete_with_special_comments_without_sharding_value">

diff --git a/...rces/integrate/cases/dql/dataset/db/select_pagination_with_diff_group_by_and_order_by.xml b/...rces/integrate/cases/dql/dataset/db/select_pagination_with_diff_group_by_and_order_by.xml
@@ -2,11 +2,5 @@
     <metadata>
         <column name="user_id" />
     </metadata>
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
     <row values="10" />
 </dataset>
diff --git a/.../dql/dataset/dbtbl_with_masterslave/select_pagination_with_diff_group_by_and_order_by.xml b/.../dql/dataset/dbtbl_with_masterslave/select_pagination_with_diff_group_by_and_order_by.xml
@@ -2,14 +2,5 @@
     <metadata>
         <column name="user_id" />
     </metadata>
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
+    <row values="10" />
 </dataset>
diff --git a/...grate/cases/dql/dataset/masterslave/select_pagination_with_diff_group_by_and_order_by.xml b/...grate/cases/dql/dataset/masterslave/select_pagination_with_diff_group_by_and_order_by.xml
@@ -2,11 +2,5 @@
     <metadata>
         <column name="user_id" />
     </metadata>
-    <row values="19" />
-    <row values="19" />
-    <row values="19" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
     <row values="10" />
 </dataset>
diff --git a/...ces/integrate/cases/dql/dataset/tbl/select_pagination_with_diff_group_by_and_order_by.xml b/...ces/integrate/cases/dql/dataset/tbl/select_pagination_with_diff_group_by_and_order_by.xml
@@ -2,14 +2,4 @@
     <metadata>
         <column name="user_id" />
     </metadata>
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
-    <row values="10" />
 </dataset>
diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/resources/integrate/env.properties b/sharding-jdbc/sharding-jdbc-core/src/test/resources/integrate/env.properties
@@ -1,4 +1,3 @@
-initialized=false
 run.additional.cases=false
 sharding.rule.type=db,tbl,dbtbl_with_masterslave,masterslave
 

diff --git a/sharding-sql-test/src/main/resources/sql/dml/delete.xml b/sharding-sql-test/src/main/resources/sql/dml/delete.xml
@@ -2,7 +2,7 @@
 <sql-cases>
     <sql-case id="delete_with_sharding_value" value="DELETE FROM t_order WHERE order_id = ? AND user_id = ? AND status=?" />
     <sql-case id="delete_without_sharding_value" value="DELETE FROM t_order WHERE status=?" />
-    <sql-case id="delete_with_special_character_without_sharding_value" value="DELETE `t_order` WHERE `status`=1" db-types="MySQL" />
+    <sql-case id="delete_with_special_character_without_sharding_value" value="DELETE FROM `t_order` WHERE `status`='init'" db-types="MySQL" />
     <sql-case id="delete_with_special_comments_return_without_sharding_value" value="DELETE /*+ index(status) */ ONLY t_order WHERE status=1 RETURN * LOG ERRORS INTO TABLE_LOG" db-types="Oracle" />
     <sql-case id="delete_with_special_comments_returning_without_sharding_value" value="DELETE /*+ index(status) */ ONLY (t_order) WHERE status=1 RETURNING *" db-types="Oracle" />
 </sql-cases>
diff --git a/sharding-sql-test/src/main/resources/sql/dml/insert.xml b/sharding-sql-test/src/main/resources/sql/dml/insert.xml
@@ -3,7 +3,7 @@
     <sql-case id="insert_with_all_placeholders" value="INSERT INTO t_order (order_id, user_id, status) VALUES (?, ?, ?)" />
     <sql-case id="insert_without_parameters" value="INSERT INTO t_order (order_id, user_id, status) VALUES (1, 1, 'insert')" />
     <sql-case id="insert_with_special_characters" value="INSERT INTO `t_order` (`order_id`, `user_id`, `status`) VALUES (1, 1, 'insert')" db-types="MySQL" />
-    <sql-case id="insert_with_special_syntax" value="INSERT /*+ index(field1) */ INTO `t_order` (`order_id`, `user_id`, `status`) VALUES (1, 1, 'insert') RETURNING order_id*2 LOG ERRORS INTO TABLE_LOG" db-types="MySQL" />
+    <sql-case id="insert_with_special_syntax" value="INSERT /*+ index(field1) */ INTO t_order (order_id, user_id, status) VALUES (1, 1, 'insert') RETURNING order_id" db-types="PostgreSQL" />
     <sql-case id="insert_with_all_placeholders_for_table_identifier" value="INSERT INTO t_order (t_order.order_id, t_order.user_id, t_order.status) VALUES (?, ?, ?)" />
     <sql-case id="insert_without_columns_with_all_placeholders" value="INSERT INTO t_order VALUES (?, ?, ?)" />
     <sql-case id="insert_set_with_all_placeholders" value="INSERT INTO t_order SET order_id = ?, user_id = ?, status = ?" db-types="MySQL" />