You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/11/01 08:10:30 UTC
[shardingsphere] branch master updated: Added SQL parser test case for AddShardingHintDatabaseValueStatement (#21878)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 3a640cc9f5f Added SQL parser test case for AddShardingHintDatabaseValueStatement (#21878)
3a640cc9f5f is described below
commit 3a640cc9f5fd7e6cebd890c4c53f0fc612a73084
Author: Ankit Dubey <da...@gmail.com>
AuthorDate: Tue Nov 1 13:40:17 2022 +0530
Added SQL parser test case for AddShardingHintDatabaseValueStatement (#21878)
* Added SQL parser test case for AddShardingHintDatabaseValueStatement
* adding License to file
---
.../distsql/ral/impl/HintRALStatementAssert.java | 5 +++
...dShardingHintDatabaseValueStatementAssert.java} | 36 +++++++++++++---------
...ShardingHintDatabaseValueStatementTestCase.java | 12 ++++++++
test/parser/src/main/resources/case/ral/hint.xml | 2 +-
4 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
index d35ecf42209..c604c29feec 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
@@ -20,10 +20,13 @@ package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statemen
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShardingHintDatabaseValueStatement;
import org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShardingHintTableValueStatement;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
+import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.hint.AddShardingHintDatabaseValueStatementAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.hint.AddShardingHintTableValueStatementAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.AddShardingHintDatabaseValueStatementTestCase;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.AddShardingHintTableValueStatementTestCase;
/**
@@ -42,6 +45,8 @@ public class HintRALStatementAssert {
public static void assertIs(final SQLCaseAssertContext assertContext, final HintRALStatement actual, final SQLParserTestCase expected) {
if (actual instanceof AddShardingHintTableValueStatement) {
AddShardingHintTableValueStatementAssert.assertIs(assertContext, (AddShardingHintTableValueStatement) actual, (AddShardingHintTableValueStatementTestCase) expected);
+ } else if (actual instanceof AddShardingHintDatabaseValueStatement) {
+ AddShardingHintDatabaseValueStatementAssert.assertIs(assertContext, (AddShardingHintDatabaseValueStatement) actual, (AddShardingHintDatabaseValueStatementTestCase) expected);
}
}
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/hint/AddShardingHintDatabaseValueStatementAssert.java
similarity index 51%
copy from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
copy to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/hint/AddShardingHintDatabaseValueStatementAssert.java
index d35ecf42209..75c44e7498a 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/HintRALStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/hint/AddShardingHintDatabaseValueStatementAssert.java
@@ -15,33 +15,39 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl;
+package org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.hint;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.statement.ral.HintRALStatement;
-import org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShardingHintTableValueStatement;
+import org.apache.shardingsphere.sharding.distsql.parser.statement.hint.AddShardingHintDatabaseValueStatement;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.hint.AddShardingHintTableValueStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
-import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.AddShardingHintTableValueStatementTestCase;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.AddShardingHintDatabaseValueStatementTestCase;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
/**
- * Hint RAL statement assert.
+ * Add sharding hint database statement assert.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class HintRALStatementAssert {
-
+public class AddShardingHintDatabaseValueStatementAssert {
+
/**
- * Assert Hint RAL statement is correct with expected parser result.
+ * Assert add sharding hint database value statement is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual hint RAL statement
- * @param expected expected hint RAL statement test case
+ * @param actual actual add sharding hint database value statement
+ * @param expected expected add sharding hint database value statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final HintRALStatement actual, final SQLParserTestCase expected) {
- if (actual instanceof AddShardingHintTableValueStatement) {
- AddShardingHintTableValueStatementAssert.assertIs(assertContext, (AddShardingHintTableValueStatement) actual, (AddShardingHintTableValueStatementTestCase) expected);
+ public static void assertIs(final SQLCaseAssertContext assertContext, final AddShardingHintDatabaseValueStatement actual, final AddShardingHintDatabaseValueStatementTestCase expected) {
+ if (null == expected) {
+ assertNull(assertContext.getText("Actual statement should not exist."), actual);
+ } else {
+ assertNotNull(assertContext.getText("Actual statement should exist."), actual);
+ assertThat(actual.getLogicTableName(), is(expected.getLogicTableName()));
+ assertThat(actual.getShardingValue(), is(expected.getShardingValue()));
}
}
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/AddShardingHintDatabaseValueStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/AddShardingHintDatabaseValueStatementTestCase.java
index 51b11bfae94..017cdae826b 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/AddShardingHintDatabaseValueStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/AddShardingHintDatabaseValueStatementTestCase.java
@@ -17,10 +17,22 @@
package org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlAttribute;
+
/**
* Add sharding hint database value statement test case.
*/
+@Getter
+@Setter
public final class AddShardingHintDatabaseValueStatementTestCase extends SQLParserTestCase {
+
+ @XmlAttribute(name = "logic-table-name")
+ private String logicTableName;
+
+ @XmlAttribute(name = "sharding-value")
+ private String shardingValue;
}
diff --git a/test/parser/src/main/resources/case/ral/hint.xml b/test/parser/src/main/resources/case/ral/hint.xml
index 49f023a562f..d449f415f9e 100644
--- a/test/parser/src/main/resources/case/ral/hint.xml
+++ b/test/parser/src/main/resources/case/ral/hint.xml
@@ -18,7 +18,7 @@
<sql-parser-test-cases>
<show-sharding-hint-status sql-case-id="show-sharding-hint-status" />
- <add-sharding-hint-database-value sql-case-id="add-sharding-hint-database-value" />
+ <add-sharding-hint-database-value sql-case-id="add-sharding-hint-database-value" logic-table-name="T_ORDER" sharding-value="1"/>
<add-sharding-hint-table-value sql-case-id="add-sharding-hint-table-value" logic-table-name="T_ORDER" sharding-value="1"/>
<set-sharding-hint-database-value sql-case-id="set-sharding-hint-database-value" />
<clear-sharding-hint sql-case-id="clear-sharding-hint" />