This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 0ae709d4357 Rename InternalSQLParserTestParameter (#22618)
0ae709d4357 is described below
commit 0ae709d43572b25657e32824082e1d694aaa9dea
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Dec 3 14:25:51 2022 +0800
Rename InternalSQLParserTestParameter (#22618)
---
.../converter/SQLNodeConverterEngineIT.java | 26 +++++++++++-----------
.../InternalMySQLParserParameterizedIT.java | 8 +++----
...ernalUnsupportedMySQLParserParameterizedIT.java | 8 +++----
.../InternalOpenGaussParserParameterizedIT.java | 8 +++----
...lUnsupportedOpenGaussParserParameterizedIT.java | 8 +++----
.../InternalOracleParserParameterizedIT.java | 8 +++----
...rnalUnsupportedOracleParserParameterizedIT.java | 8 +++----
.../InternalPostgreSQLParserParameterizedIT.java | 8 +++----
...UnsupportedPostgreSQLParserParameterizedIT.java | 8 +++----
.../sql92/InternalSQL92ParserParameterizedIT.java | 8 +++----
...ernalUnsupportedSQL92ParserParameterizedIT.java | 8 +++----
.../InternalSQLServerParserParameterizedIT.java | 8 +++----
...lUnsupportedSQLServerParserParameterizedIT.java | 8 +++----
.../sql/parser/internal/cases/sql/SQLCases.java | 16 ++++++-------
.../engine/InternalSQLParserParameterizedIT.java | 20 ++++++++---------
...nternalUnsupportedSQLParserParameterizedIT.java | 12 +++++-----
...ay.java => InternalSQLParserTestParameter.java} | 4 ++--
.../InternalDistSQLParserParameterizedIT.java | 8 +++----
18 files changed, 91 insertions(+), 91 deletions(-)
diff --git
a/kernel/sql-federation/optimizer/src/test/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/SQLNodeConverterEngineIT.java
b/kernel/sql-federation/optimizer/src/test/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/SQLNodeConverterEngineIT.java
index a3ac15a4bd7..696473e5d56 100644
---
a/kernel/sql-federation/optimizer/src/test/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/SQLNodeConverterEngineIT.java
+++
b/kernel/sql-federation/optimizer/src/test/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/SQLNodeConverterEngineIT.java
@@ -39,7 +39,7 @@ import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.registry.
import org.apache.shardingsphere.test.sql.parser.internal.cases.sql.SQLCases;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.registry.SQLCasesRegistry;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.type.SQLCaseType;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -154,20 +154,20 @@ public final class SQLNodeConverterEngineIT {
private final SQLCaseType sqlCaseType;
- public SQLNodeConverterEngineIT(final InternalSQLParserParameterizedArray
parameterizedArray) {
- sqlCaseId = parameterizedArray.getSqlCaseId();
- databaseType = parameterizedArray.getDatabaseType();
- sqlCaseType = parameterizedArray.getSqlCaseType();
+ public SQLNodeConverterEngineIT(final InternalSQLParserTestParameter
testParameter) {
+ sqlCaseId = testParameter.getSqlCaseId();
+ databaseType = testParameter.getDatabaseType();
+ sqlCaseType = testParameter.getSqlCaseType();
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return getTestParameters("MySQL", "PostgreSQL", "openGauss");
}
- private static Collection<InternalSQLParserParameterizedArray>
getTestParameters(final String... databaseTypes) {
- Collection<InternalSQLParserParameterizedArray> result = new
LinkedList<>();
- for (InternalSQLParserParameterizedArray each :
SQL_CASES.generateTestParameters(Arrays.stream(databaseTypes).collect(Collectors.toSet())))
{
+ private static Collection<InternalSQLParserTestParameter>
getTestParameters(final String... databaseTypes) {
+ Collection<InternalSQLParserTestParameter> result = new LinkedList<>();
+ for (InternalSQLParserTestParameter each :
SQL_CASES.generateTestParameters(Arrays.stream(databaseTypes).collect(Collectors.toSet())))
{
if (!isPlaceholderWithoutParameter(each) &&
isSupportedSQLCase(each)) {
result.add(each);
}
@@ -175,12 +175,12 @@ public final class SQLNodeConverterEngineIT {
return result;
}
- private static boolean isPlaceholderWithoutParameter(final
InternalSQLParserParameterizedArray parameterizedArray) {
- return SQLCaseType.Placeholder == parameterizedArray.getSqlCaseType()
&&
SQL_PARSER_TEST_CASES.get(parameterizedArray.getSqlCaseId()).getParameters().isEmpty();
+ private static boolean isPlaceholderWithoutParameter(final
InternalSQLParserTestParameter testParameter) {
+ return SQLCaseType.Placeholder == testParameter.getSqlCaseType() &&
SQL_PARSER_TEST_CASES.get(testParameter.getSqlCaseId()).getParameters().isEmpty();
}
- private static boolean isSupportedSQLCase(final
InternalSQLParserParameterizedArray parameterizedArray) {
- return
parameterizedArray.getSqlCaseId().toUpperCase().startsWith(SELECT_STATEMENT_PREFIX)
&& SUPPORTED_SQL_CASE_IDS.contains(parameterizedArray.getSqlCaseId());
+ private static boolean isSupportedSQLCase(final
InternalSQLParserTestParameter testParameter) {
+ return
testParameter.getSqlCaseId().toUpperCase().startsWith(SELECT_STATEMENT_PREFIX)
&& SUPPORTED_SQL_CASE_IDS.contains(testParameter.getSqlCaseId());
}
@Test
diff --git
a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
index d2038294d73..31f08f33b24 100644
---
a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
+++
b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.mysql.internal;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalMySQLParserParameterizedIT extends
InternalSQLParserParameterizedIT {
- public InternalMySQLParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalMySQLParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return getTestParameters("MySQL", "H2");
}
}
diff --git
a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalUnsupportedMySQLParserParameterizedIT.java
b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalUnsupportedMySQLParserParameterizedIT.java
index de95ba55895..c8fea07f802 100644
---
a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalUnsupportedMySQLParserParameterizedIT.java
+++
b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalUnsupportedMySQLParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.mysql.internal;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalUnsupportedSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalUnsupportedMySQLParserParameterizedIT extends
InternalUnsupportedSQLParserParameterizedIT {
- public InternalUnsupportedMySQLParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalUnsupportedMySQLParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return
InternalUnsupportedSQLParserParameterizedIT.getTestParameters("MySQL");
}
}
diff --git
a/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
b/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
index e8460eb67ff..0923b888b7e 100644
---
a/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
+++
b/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.opengauss;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalOpenGaussParserParameterizedIT extends
InternalSQLParserParameterizedIT {
- public InternalOpenGaussParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalOpenGaussParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return getTestParameters("openGauss");
}
}
diff --git
a/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalUnsupportedOpenGaussParserParameterizedIT.java
b/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalUnsupportedOpenGaussParserParameterizedIT.java
index e11b6a0b866..e3221ef28a7 100644
---
a/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalUnsupportedOpenGaussParserParameterizedIT.java
+++
b/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalUnsupportedOpenGaussParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.opengauss;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalUnsupportedSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalUnsupportedOpenGaussParserParameterizedIT extends
InternalUnsupportedSQLParserParameterizedIT {
- public InternalUnsupportedOpenGaussParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalUnsupportedOpenGaussParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return
InternalUnsupportedSQLParserParameterizedIT.getTestParameters("openGauss");
}
}
diff --git
a/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
b/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
index cf924205891..5885f7297e2 100644
---
a/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
+++
b/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.oracle;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalOracleParserParameterizedIT extends
InternalSQLParserParameterizedIT {
- public InternalOracleParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalOracleParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return getTestParameters("Oracle");
}
}
diff --git
a/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalUnsupportedOracleParserParameterizedIT.java
b/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalUnsupportedOracleParserParameterizedIT.java
index 14973631230..64de7d9aa3a 100644
---
a/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalUnsupportedOracleParserParameterizedIT.java
+++
b/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalUnsupportedOracleParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.oracle;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalUnsupportedSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalUnsupportedOracleParserParameterizedIT extends
InternalUnsupportedSQLParserParameterizedIT {
- public InternalUnsupportedOracleParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalUnsupportedOracleParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return
InternalUnsupportedSQLParserParameterizedIT.getTestParameters("Oracle");
}
}
diff --git
a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
index 83ebac4d5e2..ff95386baa5 100644
---
a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
+++
b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.postgresql.internal;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalPostgreSQLParserParameterizedIT extends
InternalSQLParserParameterizedIT {
- public InternalPostgreSQLParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalPostgreSQLParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return getTestParameters("PostgreSQL");
}
}
diff --git
a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalUnsupportedPostgreSQLParserParameterizedIT.java
b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalUnsupportedPostgreSQLParserParameterizedIT.java
index 39b8fa28ac7..5d3116caf30 100644
---
a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalUnsupportedPostgreSQLParserParameterizedIT.java
+++
b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalUnsupportedPostgreSQLParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.postgresql.internal;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalUnsupportedSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalUnsupportedPostgreSQLParserParameterizedIT extends
InternalUnsupportedSQLParserParameterizedIT {
- public InternalUnsupportedPostgreSQLParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalUnsupportedPostgreSQLParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return
InternalUnsupportedSQLParserParameterizedIT.getTestParameters("PostgreSQL");
}
}
diff --git
a/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
b/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
index 7fc59a4d520..79d234384fb 100644
---
a/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
+++
b/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql92;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalSQL92ParserParameterizedIT extends
InternalSQLParserParameterizedIT {
- public InternalSQL92ParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalSQL92ParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return getTestParameters("SQL92");
}
}
diff --git
a/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalUnsupportedSQL92ParserParameterizedIT.java
b/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalUnsupportedSQL92ParserParameterizedIT.java
index 5e41d11bfc1..d4b8f0fa65a 100644
---
a/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalUnsupportedSQL92ParserParameterizedIT.java
+++
b/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalUnsupportedSQL92ParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql92;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalUnsupportedSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalUnsupportedSQL92ParserParameterizedIT extends
InternalUnsupportedSQLParserParameterizedIT {
- public InternalUnsupportedSQL92ParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalUnsupportedSQL92ParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return
InternalUnsupportedSQLParserParameterizedIT.getTestParameters("SQL92");
}
}
diff --git
a/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
b/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
index 6f971a52827..91ecd44f268 100644
---
a/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
+++
b/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sqlserver;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalSQLServerParserParameterizedIT extends
InternalSQLParserParameterizedIT {
- public InternalSQLServerParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalSQLServerParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return getTestParameters("SQLServer");
}
}
diff --git
a/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalUnsupportedSQLServerParserParameterizedIT.java
b/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalUnsupportedSQLServerParserParameterizedIT.java
index d7ea888f1de..fc0b0aa01f9 100644
---
a/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalUnsupportedSQLServerParserParameterizedIT.java
+++
b/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalUnsupportedSQLServerParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sqlserver;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalUnsupportedSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalUnsupportedSQLServerParserParameterizedIT extends
InternalUnsupportedSQLParserParameterizedIT {
- public InternalUnsupportedSQLServerParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalUnsupportedSQLServerParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return
InternalUnsupportedSQLParserParameterizedIT.getTestParameters("SQLServer");
}
}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/SQLCases.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/SQLCases.java
index b353bb1c3ee..975a89617fb 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/SQLCases.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/SQLCases.java
@@ -23,7 +23,7 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.jaxb.SQLCase;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.type.CaseTypedSQLBuilderFactory;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.type.SQLCaseType;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import java.util.Arrays;
import java.util.Collection;
@@ -45,27 +45,27 @@ public final class SQLCases {
* @param databaseTypes database types to be generated
* @return generated test parameters
*/
- public Collection<InternalSQLParserParameterizedArray>
generateTestParameters(final Collection<String> databaseTypes) {
- Collection<InternalSQLParserParameterizedArray> result = new
LinkedList<>();
+ public Collection<InternalSQLParserTestParameter>
generateTestParameters(final Collection<String> databaseTypes) {
+ Collection<InternalSQLParserTestParameter> result = new LinkedList<>();
for (SQLCase each : cases.values()) {
result.addAll(generateTestParameters(databaseTypes, each));
}
return result;
}
- private Collection<InternalSQLParserParameterizedArray>
generateTestParameters(final Collection<String> databaseTypes, final SQLCase
sqlCase) {
- Collection<InternalSQLParserParameterizedArray> result = new
LinkedList<>();
+ private Collection<InternalSQLParserTestParameter>
generateTestParameters(final Collection<String> databaseTypes, final SQLCase
sqlCase) {
+ Collection<InternalSQLParserTestParameter> result = new LinkedList<>();
for (SQLCaseType each : SQLCaseType.values()) {
result.addAll(generateTestParameters(databaseTypes, sqlCase,
each));
}
return result;
}
- private Collection<InternalSQLParserParameterizedArray>
generateTestParameters(final Collection<String> databaseTypes, final SQLCase
sqlCase, final SQLCaseType caseType) {
- Collection<InternalSQLParserParameterizedArray> result = new
LinkedList<>();
+ private Collection<InternalSQLParserTestParameter>
generateTestParameters(final Collection<String> databaseTypes, final SQLCase
sqlCase, final SQLCaseType caseType) {
+ Collection<InternalSQLParserTestParameter> result = new LinkedList<>();
for (String each : getDatabaseTypes(sqlCase.getDatabaseTypes())) {
if (databaseTypes.contains(each) && containsSQLCaseType(sqlCase,
caseType)) {
- result.add(new
InternalSQLParserParameterizedArray(sqlCase.getId(), caseType, each));
+ result.add(new InternalSQLParserTestParameter(sqlCase.getId(),
caseType, each));
}
}
return result;
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 3f2ae6c877e..1dc89ee63a1 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
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.test.sql.parser.internal.cases.parser.registry.
import org.apache.shardingsphere.test.sql.parser.internal.cases.sql.SQLCases;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.registry.SQLCasesRegistry;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.type.SQLCaseType;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.Test;
import java.util.Arrays;
@@ -51,15 +51,15 @@ public abstract class InternalSQLParserParameterizedIT {
private final SQLCaseType sqlCaseType;
- public InternalSQLParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- sqlCaseId = parameterizedArray.getSqlCaseId();
- databaseType = parameterizedArray.getDatabaseType();
- sqlCaseType = parameterizedArray.getSqlCaseType();
+ public InternalSQLParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ sqlCaseId = testParameter.getSqlCaseId();
+ databaseType = testParameter.getDatabaseType();
+ sqlCaseType = testParameter.getSqlCaseType();
}
- protected static Collection<InternalSQLParserParameterizedArray>
getTestParameters(final String... databaseTypes) {
- Collection<InternalSQLParserParameterizedArray> result = new
LinkedList<>();
- for (InternalSQLParserParameterizedArray each :
SQL_CASES.generateTestParameters(Arrays.stream(databaseTypes).collect(Collectors.toSet())))
{
+ protected static Collection<InternalSQLParserTestParameter>
getTestParameters(final String... databaseTypes) {
+ Collection<InternalSQLParserTestParameter> result = new LinkedList<>();
+ for (InternalSQLParserTestParameter each :
SQL_CASES.generateTestParameters(Arrays.stream(databaseTypes).collect(Collectors.toSet())))
{
if (!isPlaceholderWithoutParameter(each)) {
result.add(each);
}
@@ -67,8 +67,8 @@ public abstract class InternalSQLParserParameterizedIT {
return result;
}
- private static boolean isPlaceholderWithoutParameter(final
InternalSQLParserParameterizedArray parameterizedArray) {
- return SQLCaseType.Placeholder == parameterizedArray.getSqlCaseType()
&&
SQL_PARSER_TEST_CASES.get(parameterizedArray.getSqlCaseId()).getParameters().isEmpty();
+ private static boolean isPlaceholderWithoutParameter(final
InternalSQLParserTestParameter testParameter) {
+ return SQLCaseType.Placeholder == testParameter.getSqlCaseType() &&
SQL_PARSER_TEST_CASES.get(testParameter.getSqlCaseId()).getParameters().isEmpty();
}
@Test
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 a3d0e226e9d..70b5585035a 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
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.test.sql.parser.internal.cases.sql.SQLCases;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.registry.UnsupportedSQLCasesRegistry;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.type.SQLCaseType;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.Test;
import java.util.Collection;
@@ -42,13 +42,13 @@ public abstract class
InternalUnsupportedSQLParserParameterizedIT {
private final SQLCaseType sqlCaseType;
- public InternalUnsupportedSQLParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- sqlCaseId = parameterizedArray.getSqlCaseId();
- databaseType = parameterizedArray.getDatabaseType();
- sqlCaseType = parameterizedArray.getSqlCaseType();
+ public InternalUnsupportedSQLParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ sqlCaseId = testParameter.getSqlCaseId();
+ databaseType = testParameter.getDatabaseType();
+ sqlCaseType = testParameter.getSqlCaseType();
}
- protected static Collection<InternalSQLParserParameterizedArray>
getTestParameters(final String databaseType) {
+ protected static Collection<InternalSQLParserTestParameter>
getTestParameters(final String databaseType) {
return
SQL_CASES.generateTestParameters(Collections.singleton(databaseType));
}
diff --git
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserParameterizedArray.java
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserTestParameter.java
similarity index 93%
rename from
test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserParameterizedArray.java
rename to
test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserTestParameter.java
index 92cffa61e1a..d6eeedefd44 100644
---
a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserParameterizedArray.java
+++
b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserTestParameter.java
@@ -22,11 +22,11 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.test.sql.parser.internal.cases.sql.type.SQLCaseType;
/**
- * Internal SQL parser parameterized array.
+ * Internal SQL parser test parameter.
*/
@RequiredArgsConstructor
@Getter
-public final class InternalSQLParserParameterizedArray {
+public final class InternalSQLParserTestParameter {
private final String sqlCaseId;
diff --git
a/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/InternalDistSQLParserParameterizedIT.java
b/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/InternalDistSQLParserParameterizedIT.java
index 73492519873..1d254825c34 100644
---
a/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/InternalDistSQLParserParameterizedIT.java
+++
b/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/InternalDistSQLParserParameterizedIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.internal;
import
org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
-import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
+import
org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserTestParameter;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -28,12 +28,12 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public final class InternalDistSQLParserParameterizedIT extends
InternalSQLParserParameterizedIT {
- public InternalDistSQLParserParameterizedIT(final
InternalSQLParserParameterizedArray parameterizedArray) {
- super(parameterizedArray);
+ public InternalDistSQLParserParameterizedIT(final
InternalSQLParserTestParameter testParameter) {
+ super(testParameter);
}
@Parameters(name = "{0}")
- public static Collection<InternalSQLParserParameterizedArray>
getTestParameters() {
+ public static Collection<InternalSQLParserTestParameter>
getTestParameters() {
return getTestParameters("ShardingSphere");
}
}
