diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/SQLToken.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/SQLToken.java index 3f6b23eb25732..843008d8f04d8 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/SQLToken.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/SQLToken.java @@ -31,11 +31,4 @@ public class SQLToken { @XmlAttribute(name = "begin-position") private int beginPosition; - - @XmlAttribute(name = "support") - private Support support = Support.ALL; - - public enum Support { - ALL, PREPARED_STATEMENT, STATEMENT - } } diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/helper/ParserAssertHelper.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/helper/ParserAssertHelper.java index 18a72136d6e7a..9ec676ac08917 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/helper/ParserAssertHelper.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/jaxb/helper/ParserAssertHelper.java @@ -13,7 +13,6 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.expression.SQLNumberExpression; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expression.SQLPlaceholderExpression; import com.dangdang.ddframe.rdb.sharding.parsing.parser.expression.SQLTextExpression; -import com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb.SQLToken.Support; import com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb.Value; import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.GeneratedKeyToken; import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.ItemsToken; @@ -33,7 +32,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; public class ParserAssertHelper { @@ -101,9 +99,12 @@ private static List result = new ArrayList<>(sqlTokens.size()); for (com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb.SQLToken each : sqlTokens) { - if (isPreparedStatement && (Support.ALL.equals(each.getSupport()) || Support.PREPARED_STATEMENT.equals(each.getSupport()))) { - result.add(each); - } else if (!isPreparedStatement && (Support.ALL.equals(each.getSupport()) || Support.STATEMENT.equals(each.getSupport()))) { + if (isPreparedStatement) { + if (!(each instanceof com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb.OffsetToken + || each instanceof com.dangdang.ddframe.rdb.sharding.parsing.parser.jaxb.RowCountToken)) { + result.add(each); + } + } else { result.add(each); } } @@ -112,31 +113,31 @@ private static List - + @@ -229,7 +229,7 @@ - + diff --git a/sharding-jdbc-core/src/test/resources/parser/select_pagination.xml b/sharding-jdbc-core/src/test/resources/parser/select_pagination.xml index 69a11a28a775c..136c6a8d3e16e 100644 --- a/sharding-jdbc-core/src/test/resources/parser/select_pagination.xml +++ b/sharding-jdbc-core/src/test/resources/parser/select_pagination.xml @@ -14,7 +14,7 @@ i.item_id AS ORDER_BY_DERIVED_0 - + @@ -44,7 +44,7 @@ i.item_id AS ORDER_BY_DERIVED_0 - + @@ -69,7 +69,7 @@ - + @@ -99,7 +99,7 @@ i.item_id AS ORDER_BY_DERIVED_0 - + @@ -129,8 +129,8 @@ i.item_id AS ORDER_BY_DERIVED_0 - - + + @@ -160,8 +160,8 @@ i.item_id AS ORDER_BY_DERIVED_0 - - + + @@ -186,8 +186,8 @@ - - + + @@ -217,8 +217,8 @@ i.item_id AS ORDER_BY_DERIVED_0 - - + + diff --git a/sharding-jdbc-core/src/test/resources/parser/select_pagination_group_by_order_by.xml b/sharding-jdbc-core/src/test/resources/parser/select_pagination_group_by_order_by.xml index 24f138584a3ff..4e5094906ec38 100644 --- a/sharding-jdbc-core/src/test/resources/parser/select_pagination_group_by_order_by.xml +++ b/sharding-jdbc-core/src/test/resources/parser/select_pagination_group_by_order_by.xml @@ -9,8 +9,8 @@ - - + + i.item_id AS ORDER_BY_DERIVED_0 @@ -44,8 +44,8 @@ - - + + i.item_id AS ORDER_BY_DERIVED_0 @@ -78,8 +78,8 @@ - - + + @@ -107,8 +107,8 @@ - - + + @@ -141,8 +141,8 @@ i.user_id AS GROUP_BY_DERIVED_0 - - + + @@ -175,8 +175,8 @@ i.user_id AS GROUP_BY_DERIVED_0 - - + + @@ -210,8 +210,8 @@ i.item_id AS GROUP_BY_DERIVED_0 - - + + @@ -245,8 +245,8 @@ i.user_id AS GROUP_BY_DERIVED_0 - - + +