This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 58f77ae Add StandardSQLParserEngineFactory (#7873)
58f77ae is described below
commit 58f77aee9d56e178c7a439da811996f417b9526c
Author: Juan Pan(Trista) <[email protected]>
AuthorDate: Wed Oct 21 19:02:29 2020 +0800
Add StandardSQLParserEngineFactory (#7873)
---
.../parameterized/EncryptSQLRewriterParameterizedTest.java | 6 +++---
.../rewrite/parameterized/MixSQLRewriterParameterizedTest.java | 6 +++---
.../parameterized/ShardingSQLRewriterParameterizedTest.java | 6 +++---
.../route/engine/type/standard/AbstractSQLRouteTest.java | 6 +++---
.../rdl/parser/engine/ShardingSphereSQLParserEngine.java | 10 +++++-----
.../rdl/parser/engine/engine/RDLSQLParserEngine.java | 4 ++--
.../parser/engine/{ => statement}/StandardSQLParserEngine.java | 4 ++--
.../StandardSQLParserEngineFactory.java} | 4 ++--
.../StatementSQLParserEngine.java} | 5 +++--
.../shardingsphere/sql/parser/SQLParseEngineFactoryTest.java | 8 ++++----
.../parameterized/engine/SQLParserParameterizedTest.java | 4 ++--
.../engine/UnsupportedSQLParserParameterizedTest.java | 4 ++--
12 files changed, 34 insertions(+), 33 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
index f7dabcd..1eb6b02 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
@@ -44,8 +44,8 @@ import
org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine;
-import
org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
import org.junit.runners.Parameterized.Parameters;
import java.io.File;
@@ -77,7 +77,7 @@ public final class EncryptSQLRewriterParameterizedTest
extends AbstractSQLRewrit
Collection<ShardingSphereRule> rules =
ShardingSphereRulesBuilder.build(
new
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(ruleConfigurations.getRules()),
ruleConfigurations.getDataSources().keySet());
StandardSQLParserEngine standardSqlParserEngine =
- SQLStatementParserEngineFactory.getSQLParserEngine(null ==
getTestParameters().getDatabaseType() ? "SQL92" :
getTestParameters().getDatabaseType());
+ StandardSQLParserEngineFactory.getSQLParserEngine(null ==
getTestParameters().getDatabaseType() ? "SQL92" :
getTestParameters().getDatabaseType());
ShardingSphereMetaData metaData = createShardingSphereMetaData();
ConfigurationProperties props = new
ConfigurationProperties(ruleConfigurations.getProps());
SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
index 333c38d..cdfb5b9 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
@@ -47,8 +47,8 @@ import
org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine;
-import
org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
import org.junit.runners.Parameterized.Parameters;
import java.io.File;
@@ -84,7 +84,7 @@ public final class MixSQLRewriterParameterizedTest extends
AbstractSQLRewriterPa
Collection<ShardingSphereRule> rules =
ShardingSphereRulesBuilder.build(
new
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(ruleConfigurations.getRules()),
ruleConfigurations.getDataSources().keySet());
StandardSQLParserEngine standardSqlParserEngine =
- SQLStatementParserEngineFactory.getSQLParserEngine(null ==
getTestParameters().getDatabaseType() ? "SQL92" :
getTestParameters().getDatabaseType());
+ StandardSQLParserEngineFactory.getSQLParserEngine(null ==
getTestParameters().getDatabaseType() ? "SQL92" :
getTestParameters().getDatabaseType());
ShardingSphereMetaData metaData = createShardingSphereMetaData();
ConfigurationProperties props = new
ConfigurationProperties(ruleConfigurations.getProps());
SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
index 4620290..8b1b498 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
@@ -47,8 +47,8 @@ import
org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine;
-import
org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
import org.junit.runners.Parameterized.Parameters;
import java.io.File;
@@ -84,7 +84,7 @@ public final class ShardingSQLRewriterParameterizedTest
extends AbstractSQLRewri
Collection<ShardingSphereRule> rules =
ShardingSphereRulesBuilder.build(
new
YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(yamlRootRuleConfigs.getRules()),
yamlRootRuleConfigs.getDataSources().keySet());
StandardSQLParserEngine standardSqlParserEngine =
- SQLStatementParserEngineFactory.getSQLParserEngine(null ==
getTestParameters().getDatabaseType() ? "SQL92" :
getTestParameters().getDatabaseType());
+ StandardSQLParserEngineFactory.getSQLParserEngine(null ==
getTestParameters().getDatabaseType() ? "SQL92" :
getTestParameters().getDatabaseType());
ShardingSphereMetaData metaData = createShardingSphereMetaData();
ConfigurationProperties props = new
ConfigurationProperties(yamlRootRuleConfigs.getProps());
SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
index 60d4993..9c418ad 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
@@ -36,8 +36,8 @@ import
org.apache.shardingsphere.infra.route.engine.SQLRouteEngine;
import org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
import
org.apache.shardingsphere.sharding.route.engine.fixture.AbstractRoutingEngineTest;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-import
org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
import java.sql.Types;
import java.util.Arrays;
@@ -58,7 +58,7 @@ public abstract class AbstractSQLRouteTest extends
AbstractRoutingEngineTest {
ShardingRule shardingRule = createAllShardingRule();
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(buildDataSourceMetas(), buildLogicSchemaMetaData(),
mock(TableAddressingMetaData.class), mock(CachedDatabaseMetaData.class));
ConfigurationProperties props = new ConfigurationProperties(new
Properties());
- StandardSQLParserEngine standardSqlParserEngine =
SQLStatementParserEngineFactory.getSQLParserEngine("MySQL");
+ StandardSQLParserEngine standardSqlParserEngine =
StandardSQLParserEngineFactory.getSQLParserEngine("MySQL");
SQLStatementContext<?> sqlStatementContext =
SQLStatementContextFactory.newInstance(
metaData.getSchemaMetaData().getConfiguredSchemaMetaData(),
parameters, standardSqlParserEngine.parse(sql, false));
LogicSQL logicSQL = new LogicSQL(sqlStatementContext, sql, parameters);
diff --git
a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngine.java
b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngine.java
index 8e0c25f..85ade0b 100644
---
a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngine.java
+++
b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngine.java
@@ -18,22 +18,22 @@
package org.apache.shardingsphere.rdl.parser.engine;
import org.apache.shardingsphere.rdl.parser.engine.engine.RDLSQLParserEngine;
-import
org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngine;
-import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StatementSQLParserEngine;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
* Sharding sphere SQL parser engine.
*/
-public final class ShardingSphereSQLParserEngine implements
SQLStatementParserEngine {
+public final class ShardingSphereSQLParserEngine implements
StatementSQLParserEngine {
private final StandardSQLParserEngine standardSqlParserEngine;
private final RDLSQLParserEngine rdlsqlParserEngine;
public ShardingSphereSQLParserEngine(final String databaseTypeName) {
- standardSqlParserEngine =
SQLStatementParserEngineFactory.getSQLParserEngine(databaseTypeName);
+ standardSqlParserEngine =
StandardSQLParserEngineFactory.getSQLParserEngine(databaseTypeName);
rdlsqlParserEngine = new RDLSQLParserEngine();
}
diff --git
a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLParserEngine.java
b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLParserEngine.java
index 8921717..6294edf 100644
---
a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLParserEngine.java
+++
b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLParserEngine.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import org.antlr.v4.runtime.tree.ParseTree;
import
org.apache.shardingsphere.rdl.parser.engine.executor.RDLSQLParserExecutor;
import org.apache.shardingsphere.rdl.parser.sql.visitor.ShardingSphereVisitor;
-import org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngine;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StatementSQLParserEngine;
import org.apache.shardingsphere.sql.parser.hook.ParsingHookRegistry;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
* RDL SQL parser engine.
*/
@RequiredArgsConstructor
-public final class RDLSQLParserEngine implements SQLStatementParserEngine {
+public final class RDLSQLParserEngine implements StatementSQLParserEngine {
private final ParsingHookRegistry parsingHookRegistry =
ParsingHookRegistry.getInstance();
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/StandardSQLParserEngine.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngine.java
similarity index 95%
rename from
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/StandardSQLParserEngine.java
rename to
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngine.java
index f987ac5..f93535b 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/StandardSQLParserEngine.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.engine;
+package org.apache.shardingsphere.sql.parser.engine.statement;
import lombok.RequiredArgsConstructor;
import org.antlr.v4.runtime.tree.ParseTree;
@@ -32,7 +32,7 @@ import java.util.Optional;
* Standard SQL parser engine.
*/
@RequiredArgsConstructor
-public final class StandardSQLParserEngine implements SQLStatementParserEngine
{
+public final class StandardSQLParserEngine implements StatementSQLParserEngine
{
private final String databaseTypeName;
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLStatementParserEngineFactory.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngineFactory.java
similarity index 94%
rename from
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLStatementParserEngineFactory.java
rename to
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngineFactory.java
index d4bc938..38264cd 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLStatementParserEngineFactory.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngineFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.engine;
+package org.apache.shardingsphere.sql.parser.engine.statement;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
* SQL statement parser engine factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SQLStatementParserEngineFactory {
+public final class StandardSQLParserEngineFactory {
private static final Map<String, StandardSQLParserEngine> ENGINES = new
ConcurrentHashMap<>();
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLStatementParserEngine.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StatementSQLParserEngine.java
similarity index 83%
rename from
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLStatementParserEngine.java
rename to
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StatementSQLParserEngine.java
index 1f1b28f..c3342a2 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLStatementParserEngine.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StatementSQLParserEngine.java
@@ -15,14 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.engine;
+package org.apache.shardingsphere.sql.parser.engine.statement;
+import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
* SQL statement parser engine.
*/
-public interface SQLStatementParserEngine extends
SQLParserEngine<SQLStatement> {
+public interface StatementSQLParserEngine extends
SQLParserEngine<SQLStatement> {
@Override
SQLStatement parse(String sql, boolean useCache);
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/SQLParseEngineFactoryTest.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/SQLParseEngineFactoryTest.java
index 706332c..4b45eb0 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/SQLParseEngineFactoryTest.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/SQLParseEngineFactoryTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sql.parser;
-import
org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngineFactory;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -33,13 +33,13 @@ public final class SQLParseEngineFactoryTest {
@Before
@After
public void reset() throws NoSuchFieldException, IllegalAccessException {
- Field field =
SQLStatementParserEngineFactory.class.getDeclaredField("ENGINES");
+ Field field =
StandardSQLParserEngineFactory.class.getDeclaredField("ENGINES");
field.setAccessible(true);
- ((Map) field.get(SQLStatementParserEngineFactory.class)).clear();
+ ((Map) field.get(StandardSQLParserEngineFactory.class)).clear();
}
@Test
public void assertGetSQLParseEngine() {
-
assertThat(SQLStatementParserEngineFactory.getSQLParserEngine("MySQL"),
is(SQLStatementParserEngineFactory.getSQLParserEngine("MySQL")));
+ assertThat(StandardSQLParserEngineFactory.getSQLParserEngine("MySQL"),
is(StandardSQLParserEngineFactory.getSQLParserEngine("MySQL")));
}
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
index 5d81a18..0c512a0 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.parameterized.engine;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngineFactory;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.SQLStatementAssert;
@@ -78,7 +78,7 @@ public abstract class SQLParserParameterizedTest {
SQLParserTestCase expected =
SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId);
String databaseType = "H2".equals(this.databaseType) ? "MySQL" :
this.databaseType;
String sql = SQL_CASES_LOADER.getSQL(sqlCaseId, sqlCaseType,
SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters());
- SQLStatement actual =
SQLStatementParserEngineFactory.getSQLParserEngine(databaseType).parse(sql,
false);
+ SQLStatement actual =
StandardSQLParserEngineFactory.getSQLParserEngine(databaseType).parse(sql,
false);
SQLStatementAssert.assertIs(new SQLCaseAssertContext(sqlCaseId,
sqlCaseType), actual, expected);
}
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/UnsupportedSQLParserParameterizedTest.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/UnsupportedSQLParserParameterizedTest.java
index a607d13..208f39c 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/UnsupportedSQLParserParameterizedTest.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/UnsupportedSQLParserParameterizedTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.parameterized.engine;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.sql.parser.engine.SQLStatementParserEngineFactory;
+import
org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
import
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.loader.SQLCasesLoader;
@@ -47,6 +47,6 @@ public abstract class UnsupportedSQLParserParameterizedTest {
public final void assertUnsupportedSQL() {
String sql = SQL_CASES_LOADER.getSQL(sqlCaseId, sqlCaseType,
Collections.emptyList());
String databaseType = "H2".equals(this.databaseType) ? "MySQL" :
this.databaseType;
-
SQLStatementParserEngineFactory.getSQLParserEngine(databaseType).parse(sql,
false);
+
StandardSQLParserEngineFactory.getSQLParserEngine(databaseType).parse(sql,
false);
}
}
