diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/jaxb/helper/SQLStatementHelper.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/jaxb/helper/SQLStatementHelper.java index 4ea9c0a1b2dfab964d2bb4cd4a70f23039a344e5..596275d05ce0d874b86432ce25a9cade5e277e08 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/jaxb/helper/SQLStatementHelper.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/jaxb/helper/SQLStatementHelper.java @@ -13,7 +13,6 @@ import javax.xml.bind.JAXBException; import java.io.File; import java.net.URL; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -73,13 +72,13 @@ public final class SQLStatementHelper { } public static String getSql(final String sqlId) { - return STATEMENT_MAP.get(sqlId).getSql(); + checkSqlId(sqlId); + SQLStatement statement = STATEMENT_MAP.get(sqlId); + return statement.getSql(); } public static Set getTypes(final String sqlId) { - if (null == sqlId || !STATEMENT_MAP.containsKey(sqlId)) { - return Collections.emptySet(); - } + checkSqlId(sqlId); SQLStatement statement = STATEMENT_MAP.get(sqlId); if (null == statement.getTypes()) { return Sets.newHashSet(DatabaseType.values()); @@ -90,4 +89,10 @@ public final class SQLStatementHelper { } return result; } + + private static void checkSqlId(final String sqlId) { + if (null == sqlId || !STATEMENT_MAP.containsKey(sqlId)) { + throw new RuntimeException("Can't find sql of id:" + sqlId); + } + } } diff --git a/sharding-jdbc-core/src/test/resources/parser/create.xml b/sharding-jdbc-core/src/test/resources/parser/create.xml index 000e842cdcfa38cd61d9dd790e29eae0b595eab4..7b2c864c072b03381786335edaad6f507d32697e 100644 --- a/sharding-jdbc-core/src/test/resources/parser/create.xml +++ b/sharding-jdbc-core/src/test/resources/parser/create.xml @@ -15,12 +15,12 @@ - +
- +
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 7eb16d2060c6071aa2440457ca2607759033d83a..ecd5e548de423c3c317d16b19f39927a741be01d 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 @@ -46,11 +46,10 @@ - +
-
@@ -70,11 +69,10 @@ - +
-
@@ -87,18 +85,17 @@ - + - +
-
@@ -111,18 +108,17 @@ - + - +
-
@@ -142,12 +138,10 @@ - +
-
-
@@ -167,12 +161,10 @@ - +
-
-
diff --git a/sharding-jdbc-core/src/test/resources/sql/ddl/create.xml b/sharding-jdbc-core/src/test/resources/sql/ddl/create.xml index 8a9396468a8760891d8994cb293c9f986d0e77f9..db97285b5de18f918572e5f8b39b42bd856f057d 100644 --- a/sharding-jdbc-core/src/test/resources/sql/ddl/create.xml +++ b/sharding-jdbc-core/src/test/resources/sql/ddl/create.xml @@ -4,6 +4,6 @@ - +