for #1216, move the UpdateStatementParserTest relative test cases to IntegrateParsingTest for oracle special syntax.

sharding-core/src/test/java/io/shardingsphere/core/parsing/parser/sql/UpdateStatementParserTest.java

@@ -17,57 +17,19 @@
 
 package io.shardingsphere.core.parsing.parser.sql;
 
-import com.google.common.collect.Range;
-import io.shardingsphere.core.api.algorithm.sharding.ListShardingValue;
-import io.shardingsphere.core.api.algorithm.sharding.RangeShardingValue;
 import io.shardingsphere.core.constant.DatabaseType;
-import io.shardingsphere.core.constant.ShardingOperator;
 import io.shardingsphere.core.parsing.SQLParsingEngine;
-import io.shardingsphere.core.parsing.parser.context.condition.Column;
-import io.shardingsphere.core.parsing.parser.context.condition.Condition;
 import io.shardingsphere.core.parsing.parser.sql.dml.DMLStatement;
 import io.shardingsphere.core.rule.ShardingRule;
-import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
-import java.util.Collections;
-import java.util.Iterator;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public final class UpdateStatementParserTest extends AbstractStatementParserTest {
-
-    @Test
-    public void parseWithoutParameter() {
-        ShardingRule shardingRule = createShardingRule();
-        SQLParsingEngine statementParser = new SQLParsingEngine(DatabaseType.MySQL, "UPDATE TABLE_XXX xxx SET TABLE_XXX.field1=field1+1,xxx.field2=2 WHERE TABLE_XXX.field4<10 AND"
-                + " TABLE_XXX.field1=1 AND xxx.field5>10 AND TABLE_XXX.field2 IN (1,3) AND xxx.field6<=10 AND TABLE_XXX.field3 BETWEEN 5 AND 20 AND xxx.field7>=10", shardingRule, null);
-        DMLStatement updateStatement = (DMLStatement) statementParser.parse(false);
-        assertUpdateStatementWithoutParameter(updateStatement);
-    }
-
-    private void assertUpdateStatementWithoutParameter(final DMLStatement updateStatement) {
-        assertThat(updateStatement.getTables().find("TABLE_XXX").get().getName(), is("TABLE_XXX"));
-        assertThat(updateStatement.getTables().find("TABLE_XXX").get().getAlias().get(), is("xxx"));
-        Condition condition1 = updateStatement.getConditions().find(new Column("field1", "TABLE_XXX")).get();
-        assertThat(condition1.getOperator(), CoreMatchers.is(ShardingOperator.EQUAL));
-        assertThat(((ListShardingValue<? extends Comparable>) condition1.getShardingValue(Collections.emptyList())).getValues().iterator().next(), is((Comparable) 1));
-        Condition condition2 = updateStatement.getConditions().find(new Column("field2", "TABLE_XXX")).get();
-        assertThat(condition2.getOperator(), is(ShardingOperator.IN));
-        Iterator<?> shardingValues2 = ((ListShardingValue) condition2.getShardingValue(Collections.emptyList())).getValues().iterator();
-        assertThat(shardingValues2.next(), is((Object) 1));
-        assertThat(shardingValues2.next(), is((Object) 3));
-        assertFalse(shardingValues2.hasNext());
-        Condition condition3 = updateStatement.getConditions().find(new Column("field3", "TABLE_XXX")).get();
-        Range shardingValues3 = ((RangeShardingValue) condition3.getShardingValue(Collections.emptyList())).getValueRange();
-        assertThat(condition3.getOperator(), is(ShardingOperator.BETWEEN));
-        assertThat(shardingValues3.lowerEndpoint(), is((Comparable) 5));
-        assertThat(shardingValues3.upperEndpoint(), is((Comparable) 20));
-    }
-
+
     @Test
     public void parseWithOr() {
         ShardingRule shardingRule = createShardingRule();
@@ -82,21 +44,4 @@ private void assertUpdateStatementWitOr(final DMLStatement updateStatement) {
         assertTrue(updateStatement.getConditions().getOrCondition().getAndConditions().isEmpty());
 
     }
-
-    @Test
-    public void parseWithSpecialSyntax() {
-        parseWithSpecialSyntax(DatabaseType.Oracle, "UPDATE /*+ index(field1) */ ONLY TABLE_XXX SET field1=1 WHERE field1=1 RETURN * LOG ERRORS INTO TABLE_LOG");
-        parseWithSpecialSyntax(DatabaseType.Oracle, "UPDATE /*+ index(field1) */ ONLY TABLE_XXX SET field1=1 WHERE field1=1 RETURNING *");
-        parseWithSpecialSyntax(DatabaseType.Oracle, "UPDATE /*+ index(field1) */ ONLY TABLE_XXX SET field1=1 WHERE field1=1 LOG ERRORS INTO TABLE_LOG");
-    }
-
-    private void parseWithSpecialSyntax(final DatabaseType dbType, final String actualSQL) {
-        ShardingRule shardingRule = createShardingRule();
-        DMLStatement updateStatement = (DMLStatement) new SQLParsingEngine(dbType, actualSQL, shardingRule, null).parse(false);
-        assertThat(updateStatement.getTables().find("TABLE_XXX").get().getName(), is("TABLE_XXX"));
-        assertFalse(updateStatement.getTables().find("TABLE_XXX").get().getAlias().isPresent());
-        Condition condition = updateStatement.getConditions().find(new Column("field1", "TABLE_XXX")).get();
-        assertThat(condition.getOperator(), is(ShardingOperator.EQUAL));
-        assertThat(((ListShardingValue<? extends Comparable>) condition.getShardingValue(Collections.emptyList())).getValues().iterator().next(), is((Object) 1));
-    }
 }

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

@@ -104,4 +104,42 @@
         </or-condition>
     </parser-result>
 
+    <parser-result sql-case-id="update_with_special_comments" parameters="'update', 1, 1">
+        <tables>
+            <table name="t_order" />
+        </tables>
+        <tokens>
+            <table-token begin-position="33" original-literals="t_order" />
+        </tokens>
+        <or-condition>
+            <and-condition>
+                <condition column-name="order_id" table-name="t_order" operator="EQUAL">
+                    <value index="1" literal="1" type="int" />
+                </condition>
+                <condition column-name="user_id" table-name="t_order" operator="EQUAL">
+                    <value index="2" literal="1" type="int" />
+                </condition>
+            </and-condition>
+        </or-condition>
+    </parser-result>
+
+    <parser-result sql-case-id="update_without_parameters">
+        <tables>
+            <table name="t_order" />
+        </tables>
+        <tokens>
+            <table-token begin-position="7" original-literals="t_order" />
+        </tokens>
+        <or-condition>
+            <and-condition>
+                <condition column-name="order_id" table-name="t_order" operator="EQUAL">
+                    <value literal="1000" type="int" />
+                </condition>
+                <condition column-name="user_id" table-name="t_order" operator="EQUAL">
+                    <value literal="10" type="int" />
+                </condition>
+            </and-condition>
+        </or-condition>
+    </parser-result>
+
 </parser-result-sets>

sharding-jdbc/src/test/resources/integrate/cases/dml/dml-integrate-test-cases.xml

@@ -104,7 +104,15 @@
     <dml-test-case sql-case-id="update_with_special_character">
         <assertion parameters="update:String, 1000:int, 10:int" expected-data-file="update.xml" />
     </dml-test-case>
-
+
+    <dml-test-case sql-case-id="update_with_special_comments">
+        <assertion parameters="update:String, 1000:int, 10:int" expected-data-file="update.xml" />
+    </dml-test-case>
+
+    <dml-test-case sql-case-id="update_without_parameters">
+        <assertion expected-data-file="update.xml" />
+    </dml-test-case>
+
     <dml-test-case sql-case-id="delete_with_sharding_value">
         <assertion parameters="1000:int, 10:int, init:String" expected-data-file="delete_with_sharding_value.xml" />
     </dml-test-case>

sharding-sql-test/src/main/resources/sql/dml/update.xml

@@ -6,4 +6,6 @@
     <sql-case id="update_without_condition" value="UPDATE t_order o SET o.status = 'finished'" db-types="MySQL,H2" />
     <sql-case id="update_with_extra_keywords" value="UPDATE LOW_PRIORITY IGNORE t_order SET status = ? WHERE order_id = ? AND user_id = ?" db-types="MySQL" />
     <sql-case id="update_with_special_character" value="UPDATE `t_order` SET `status` = ? WHERE `order_id` = ? AND user_id = ?" db-types="MySQL" />
+    <sql-case id="update_with_special_comments" value="UPDATE /*+ index(field1) */ ONLY t_order SET status=? WHERE order_id = ? AND user_id = ? RETURN * LOG ERRORS INTO TABLE_LOG" db-types="Oracle" />
+    <sql-case id="update_without_parameters" value="UPDATE t_order SET status = 'update' WHERE order_id = 1000 AND user_id = 10" />
 </sql-cases>