Merge pull request #352 from guangyun1013/1.5.3-SNAPSHOT

Add SQLToken test

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/base/AbstractSQLAssertTest.java

@@ -240,6 +240,8 @@ private void setParameters(final PreparedStatement preparedStatement, final List
         for (String each : parameters) {
             if (each.contains("'")) {
                 preparedStatement.setString(index++, each.replace("'", ""));
+            } else if ("null".equalsIgnoreCase(each)) {
+                preparedStatement.setObject(index++, null);
             } else {
                 preparedStatement.setInt(index++, Integer.valueOf(each));
             }

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/NullableShardingTableOnlyTest.java

@@ -40,6 +40,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -55,7 +56,10 @@ public NullableShardingTableOnlyTest(final String testCaseName, final String sql
 
     @Parameterized.Parameters(name = "{0}")
     public static Collection<Object[]> dataParameters() {
-        return SQLAssertJAXBHelper.getDataParameters("integrate/assert/select_aggregate.xml");
+        List<Object[]> result = new LinkedList<>();
+        result.addAll(SQLAssertJAXBHelper.getDataParameters("integrate/assert/select_aggregate.xml"));
+        result.addAll(SQLAssertJAXBHelper.getDataParameters("integrate/assert/select_nullable.xml"));
+        return result;
     }
 
     @Override

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/base/AbstractBaseParseSQLTest.java

@@ -28,7 +28,7 @@ protected final void assertPreparedStatement(final SQLStatement actual) {
     private void assertSQLStatement(final SQLStatement actual, final boolean isPreparedStatement) {
         ParserAssertHelper.assertTables(expected.getTables(), actual.getTables());
         ParserAssertHelper.assertConditions(expected.getConditions(), actual.getConditions(), isPreparedStatement);
-        ParserAssertHelper.assertSqlTokens(expected.getTableTokens(), actual.getSqlTokens());
+        ParserAssertHelper.assertSqlTokens(expected.getSqlTokens(), actual.getSqlTokens(), isPreparedStatement);
         if (actual instanceof SelectStatement) {
             SelectStatement selectStatement = (SelectStatement) actual;
             SelectStatement expectedSqlStatement = ParserJAXBHelper.getSelectStatement(expected); 

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/Assert.java

@@ -25,6 +25,8 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
+
+import java.util.ArrayList;
 import java.util.List;
 
 @Getter
@@ -47,7 +49,25 @@ public final class Assert {
     @XmlElementWrapper(name = "table-tokens")
     @XmlElement(name = "table-token")
     private List<TableToken> tableTokens;
-
+
+    @XmlElement(name = "items-token")
+    private ItemsToken itemsToken;
+
+    @XmlElement(name = "generated-key-token")
+    private GeneratedKeyToken generatedKeyToken;
+
+    @XmlElement(name = "multiple-insert-values-token")
+    private MultipleInsertValuesToken multipleInsertValuesToken;
+
+    @XmlElement(name = "order-by-token")
+    private OrderByToken orderByToken;
+
+    @XmlElement(name = "offset-token")
+    private OffsetToken offsetToken;
+
+    @XmlElement(name = "row-count-token")
+    private RowCountToken rowCountToken;
+
     @XmlElementWrapper(name = "order-by-columns")
     @XmlElement(name = "order-by-column") 
     private List<OrderByColumn> orderByColumns;
@@ -62,4 +82,30 @@ public final class Assert {
 
     @XmlElement 
     private Limit limit;
+
+    public List<SQLToken> getSqlTokens() {
+        List<SQLToken> result = new ArrayList<SQLToken>(7);
+        if (tableTokens != null) {
+            result.addAll(tableTokens);
+        }
+        if (offsetToken != null) {
+            result.add(offsetToken);
+        }
+        if (rowCountToken != null) {
+            result.add(rowCountToken);
+        }
+        if (itemsToken != null) {
+            result.add(itemsToken);
+        }
+        if (generatedKeyToken != null) {
+            result.add(generatedKeyToken);
+        }
+        if (multipleInsertValuesToken != null) {
+            result.add(multipleInsertValuesToken);
+        }
+        if (orderByToken != null) {
+            result.add(orderByToken);
+        }
+        return result;
+    }
 }

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/GeneratedKeyToken.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+public final class GeneratedKeyToken extends SQLToken {
+
+    @XmlAttribute(name = "begin-position-of-statement")
+    private int beginPositionOfStatement;
+
+    @XmlAttribute(name = "begin-position-of-prepared-statement")
+    private int beginPositionOfPreparedStatement;
+}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/ItemsToken.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ItemsToken extends SQLToken {
+
+    @XmlElementWrapper(name = "items")
+    @XmlElement(name = "item")
+    private List<String> items = new LinkedList<>();
+}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/MultipleInsertValuesToken.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+public class MultipleInsertValuesToken extends SQLToken {
+
+    @XmlElementWrapper(name = "values")
+    @XmlElement(name = "value")
+    private List<String> values = new LinkedList<>();
+}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/OffsetToken.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+public class OffsetToken extends SQLToken {
+
+    @XmlAttribute(name = "offset")
+    private int offset;
+}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/OrderByToken.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+public final class OrderByToken extends SQLToken {
+
+    @XmlAttribute(name = "begin-position-of-statement")
+    private int beginPositionOfStatement;
+
+    @XmlAttribute(name = "begin-position-of-prepared-statement")
+    private int beginPositionOfPreparedStatement;
+}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/RowCountToken.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+public class RowCountToken extends SQLToken {
+
+    @XmlAttribute(name = "row-count")
+    private int rowCount;
+}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/SQLToken.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+public class SQLToken {
+
+    @XmlAttribute(name = "begin-position")
+    private int beginPosition;
+}

sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/TableToken.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
 package com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb;
 
 import lombok.Getter;
@@ -10,10 +27,7 @@
 @Getter
 @Setter
 @XmlAccessorType(XmlAccessType.FIELD)
-public class TableToken {
-
-    @XmlAttribute(name = "begin-position")
-    private int beginPosition;
+public class TableToken extends SQLToken {
 
     @XmlAttribute(name = "original-literals")
     private String originalLiterals;