You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/11/25 05:54:32 UTC
[shardingsphere] branch master updated: Refactor SQLCasesLoader.getCaseValue (#22403)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 a1da19a3471 Refactor SQLCasesLoader.getCaseValue (#22403)
a1da19a3471 is described below
commit a1da19a3471f1f87ec7e1eb45e25a42322ad249c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Nov 25 13:54:25 2022 +0800
Refactor SQLCasesLoader.getCaseValue (#22403)
---
.../engine/SQLNodeConverterEngineParameterizedTest.java | 2 +-
.../test/sql/parser/internal/asserts/SQLCaseAssertContext.java | 6 ++----
.../parser/internal/engine/InternalSQLParserParameterizedIT.java | 7 +++----
.../engine/InternalUnsupportedSQLParserParameterizedIT.java | 2 +-
.../test/sql/parser/internal/loader/SQLCasesLoader.java | 3 +--
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java b/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
index 98837701019..401be2dd6fb 100644
--- a/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
+++ b/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
@@ -176,7 +176,7 @@ public final class SQLNodeConverterEngineParameterizedTest {
@Test
public void assertConvert() {
String databaseType = "H2".equals(this.databaseType) ? "MySQL" : this.databaseType;
- String sql = SQL_CASES_LOADER.getCaseValue(sqlCaseId, sqlCaseType, SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters(), databaseType);
+ String sql = SQL_CASES_LOADER.getCaseValue(sqlCaseId, sqlCaseType, SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters());
SQLStatement sqlStatement = parseSQLStatement(databaseType, sql);
SqlNode actual = SQLNodeConverterEngine.convert(sqlStatement);
SqlNode expected = parseSqlNode(databaseType, sql);
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/SQLCaseAssertContext.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/SQLCaseAssertContext.java
index 1a558cbf9a6..9b44e7fdc43 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/SQLCaseAssertContext.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/SQLCaseAssertContext.java
@@ -41,8 +41,6 @@ public final class SQLCaseAssertContext {
@Getter
private final SQLCaseType sqlCaseType;
- private final String databaseType;
-
/**
* Get message text.
*
@@ -66,13 +64,13 @@ public final class SQLCaseAssertContext {
private void appendSQL(final StringBuilder builder) {
builder.append("SQL : ");
if (SQLCaseType.Placeholder == sqlCaseType) {
- builder.append(sqlCasesLoader.getCaseValue(sqlCaseId, sqlCaseType, Collections.emptyList(), databaseType));
+ builder.append(sqlCasesLoader.getCaseValue(sqlCaseId, sqlCaseType, Collections.emptyList()));
builder.append(System.lineSeparator());
builder.append("SQL Params : ");
builder.append(SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters());
builder.append(System.lineSeparator());
} else {
- builder.append(sqlCasesLoader.getCaseValue(sqlCaseId, sqlCaseType, SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters(), databaseType));
+ builder.append(sqlCasesLoader.getCaseValue(sqlCaseId, sqlCaseType, SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters()));
}
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalSQLParserParameterizedIT.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalSQLParserParameterizedIT.java
index 274149c256e..f989dd7059c 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalSQLParserParameterizedIT.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalSQLParserParameterizedIT.java
@@ -68,10 +68,9 @@ public abstract class InternalSQLParserParameterizedIT {
@Test
public final void assertSupportedSQL() {
SQLParserTestCase expected = SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId);
- String databaseType = "H2".equals(this.databaseType) ? "MySQL" : this.databaseType;
- String sql = SQL_CASES_LOADER.getCaseValue(sqlCaseId, sqlCaseType, SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters(), databaseType);
- SQLStatement actual = parseSQLStatement(databaseType, sql);
- SQLStatementAssert.assertIs(new SQLCaseAssertContext(SQL_CASES_LOADER, sqlCaseId, sqlCaseType, databaseType), actual, expected);
+ String sql = SQL_CASES_LOADER.getCaseValue(sqlCaseId, sqlCaseType, SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters());
+ SQLStatement actual = parseSQLStatement("H2".equals(databaseType) ? "MySQL" : databaseType, sql);
+ SQLStatementAssert.assertIs(new SQLCaseAssertContext(SQL_CASES_LOADER, sqlCaseId, sqlCaseType), actual, expected);
}
private SQLStatement parseSQLStatement(final String databaseType, final String sql) {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalUnsupportedSQLParserParameterizedIT.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalUnsupportedSQLParserParameterizedIT.java
index 084b740b1ff..dc4e20e67e0 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalUnsupportedSQLParserParameterizedIT.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalUnsupportedSQLParserParameterizedIT.java
@@ -50,7 +50,7 @@ public abstract class InternalUnsupportedSQLParserParameterizedIT {
@Test(expected = Exception.class)
// TODO should expect SQLParsingException only
public final void assertUnsupportedSQL() {
- String sql = SQL_CASES_LOADER.getCaseValue(sqlCaseId, sqlCaseType, Collections.emptyList(), databaseType);
+ String sql = SQL_CASES_LOADER.getCaseValue(sqlCaseId, sqlCaseType, Collections.emptyList());
String databaseType = "H2".equals(this.databaseType) ? "MySQL" : this.databaseType;
CacheOption cacheOption = new CacheOption(128, 1024L);
ParseASTNode parseContext = new SQLParserEngine(databaseType, cacheOption).parse(sql, false);
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/loader/SQLCasesLoader.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/loader/SQLCasesLoader.java
index 2cdf8fb73b1..85eb63bf6b4 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/loader/SQLCasesLoader.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/loader/SQLCasesLoader.java
@@ -96,10 +96,9 @@ public final class SQLCasesLoader {
* @param sqlCaseId SQL case id
* @param sqlCaseType SQL case type
* @param params parameters
- * @param databaseType database type
* @return SQL case value
*/
- public String getCaseValue(final String sqlCaseId, final SQLCaseType sqlCaseType, final List<?> params, final String databaseType) {
+ public String getCaseValue(final String sqlCaseId, final SQLCaseType sqlCaseType, final List<?> params) {
switch (sqlCaseType) {
case Literal:
return getLiteralSQL(getSQLFromMap(sqlCaseId, getCases()), params);