You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/06/05 03:20:57 UTC
(shardingsphere) branch master updated: Remove useless parser-sql-statement-sql92 (#35588)
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 69017d89366 Remove useless parser-sql-statement-sql92 (#35588)
69017d89366 is described below
commit 69017d893665c4a290a8d75e2a644749245ea1f4
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 5 11:20:51 2025 +0800
Remove useless parser-sql-statement-sql92 (#35588)
* Remove useless parser-sql-statement-sql92
* Remove useless parser-sql-statement-sql92
---
.../core/advice/SQLRouteCountAdviceTest.java | 4 +--
...penTelemetryJDBCExecutorCallbackAdviceTest.java | 4 +--
.../fixture/EncryptGeneratorFixtureBuilder.java | 3 +-
.../ddl/ShardingAlterViewSupportedCheckerTest.java | 5 ++-
...ShardingCreateFunctionSupportedCheckerTest.java | 7 ++--
...hardingCreateProcedureSupportedCheckerTest.java | 7 ++--
.../ddl/ShardingInsertSupportedCheckerTest.java | 3 +-
.../merge/ShardingResultMergerEngineTest.java | 3 +-
.../common/IteratorStreamMergedResultTest.java | 3 +-
.../dql/groupby/GroupByRowComparatorTest.java | 13 ++++----
.../dql/orderby/OrderByStreamMergedResultTest.java | 3 +-
.../merge/dql/orderby/OrderByValueTest.java | 7 ++--
.../pagination/LimitDecoratorMergedResultTest.java | 7 ++--
.../impl/ShardingRemoveTokenGeneratorTest.java | 3 +-
.../groupby/engine/GroupByContextEngineTest.java | 5 ++-
.../orderby/engine/OrderByContextEngineTest.java | 7 ++--
.../select/pagination/PaginationContextTest.java | 5 ++-
.../engine/PaginationContextEngineTest.java | 5 ++-
.../statement/SQLStatementContextFactoryTest.java | 3 +-
.../statement/ddl/PrepareStatementContextTest.java | 3 +-
.../statement/dml/InsertStatementContextTest.java | 3 +-
.../statement/dml/SelectStatementContextTest.java | 31 +++++++++--------
.../type/ExistsSubqueryExpressionBinderTest.java | 3 +-
.../expression/type/SubquerySegmentBinderTest.java | 3 +-
.../statement/dml/InsertStatementBinderTest.java | 5 ++-
.../statement/dml/SelectStatementBinderTest.java | 3 +-
.../transaction/util/AutoCommitUtilsTest.java | 3 +-
parser/sql/dialect/sql92/pom.xml | 5 ---
.../statement/type/SQL92DMLStatementVisitor.java | 8 ++---
parser/sql/engine/pom.xml | 2 +-
.../core/statement/dml/SelectStatement.java | 12 ++-----
parser/sql/statement/type/pom.xml | 1 -
parser/sql/statement/type/sql92/pom.xml | 36 --------------------
.../sql/parser/statement/sql92/SQL92Statement.java | 26 ---------------
.../statement/sql92/dml/SQL92SelectStatement.java | 39 ----------------------
.../connector/sane/SaneQueryResultEngineTest.java | 4 +--
36 files changed, 73 insertions(+), 211 deletions(-)
diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteCountAdviceTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteCountAdviceTest.java
index c6e480aa602..5e0ab7c3875 100644
--- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteCountAdviceTest.java
+++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteCountAdviceTest.java
@@ -32,8 +32,8 @@ import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.DeleteStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.UpdateStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -88,7 +88,7 @@ class SQLRouteCountAdviceTest {
@Test
void assertSelectRoute() {
QueryContext queryContext = new QueryContext(new UnknownSQLStatementContext(
- databaseType, new SQL92SelectStatement()), "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
+ databaseType, new SelectStatement()), "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
assertRoute(queryContext, "SELECT=1");
}
diff --git a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
index b698088b1dc..f087d1dabc6 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryJDBCExecutorCallbackAdviceTest.java
@@ -41,7 +41,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.J
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -99,7 +99,7 @@ class OpenTelemetryJDBCExecutorCallbackAdviceTest {
ResourceMetaData resourceMetaData = mock(ResourceMetaData.class, RETURNS_DEEP_STUBS);
when(resourceMetaData.getStorageUnits().get(DATA_SOURCE_NAME).getStorageType()).thenReturn(TypedSPILoader.getService(DatabaseType.class, "SQL92"));
when(resourceMetaData.getStorageUnits().get(DATA_SOURCE_NAME).getConnectionProperties()).thenReturn(mock(ConnectionProperties.class));
- JDBCExecutorCallback jdbcExecutorCallback = new JDBCExecutorCallbackFixture(TypedSPILoader.getService(DatabaseType.class, "SQL92"), resourceMetaData, new SQL92SelectStatement(), true);
+ JDBCExecutorCallback jdbcExecutorCallback = new JDBCExecutorCallbackFixture(TypedSPILoader.getService(DatabaseType.class, "SQL92"), resourceMetaData, new SelectStatement(), true);
Plugins.getMemberAccessor().set(JDBCExecutorCallback.class.getDeclaredField("resourceMetaData"), jdbcExecutorCallback, resourceMetaData);
targetObject = (TargetAdviceObject) jdbcExecutorCallback;
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
index 6512dab6108..aafb630f483 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
@@ -60,7 +60,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertS
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.UpdateStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import java.util.ArrayList;
import java.util.Arrays;
@@ -145,7 +144,7 @@ public final class EncryptGeneratorFixtureBuilder {
result.setInsertColumns(new InsertColumnsSegment(0, 0, Collections.emptyList()));
result.getDerivedInsertColumns().addAll(insertColumns);
}
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_user"))));
ProjectionsSegment projections = new ProjectionsSegment(0, 0);
projections.getProjections().add(new ColumnProjectionSegment(userIdColumn));
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterViewSupportedCheckerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterViewSupportedCheckerTest.java
index b3b5ce4f36d..e2d605ffa65 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterViewSupportedCheckerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingAlterViewSupportedCheckerTest.java
@@ -32,7 +32,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.AlterVi
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.statement.mysql.ddl.MySQLAlterViewStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
@@ -57,7 +56,7 @@ class ShardingAlterViewSupportedCheckerTest {
@Test
void assertPreValidateAlterView() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
selectStatement.setProjections(new ProjectionsSegment(0, 0));
AlterViewStatement sqlStatement = new MySQLAlterViewStatement();
@@ -74,7 +73,7 @@ class ShardingAlterViewSupportedCheckerTest {
@Test
void assertPreValidateAlterViewWithShardingTable() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
selectStatement.setProjections(new ProjectionsSegment(0, 0));
AlterViewStatement sqlStatement = mock(AlterViewStatement.class);
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateFunctionSupportedCheckerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateFunctionSupportedCheckerTest.java
index 7bcc76c5616..c3b93550fde 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateFunctionSupportedCheckerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateFunctionSupportedCheckerTest.java
@@ -32,7 +32,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateF
import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateTableStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
@@ -54,7 +53,7 @@ class ShardingCreateFunctionSupportedCheckerTest {
@Test
void assertCheckCreateFunction() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("bar_tbl"))));
CreateTableStatement createTableStatement = mock(CreateTableStatement.class);
when(createTableStatement.getTable()).thenReturn(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_tbl"))));
@@ -76,7 +75,7 @@ class ShardingCreateFunctionSupportedCheckerTest {
@Test
void assertCheckCreateFunctionWithShardingTable() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_tbl"))));
ValidStatementSegment validStatementSegment = new ValidStatementSegment(0, 0);
validStatementSegment.setSqlStatement(selectStatement);
@@ -92,7 +91,7 @@ class ShardingCreateFunctionSupportedCheckerTest {
@Test
void assertCheckCreateFunctionWithNoSuchTable() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_tbl"))));
ValidStatementSegment validStatementSegment = new ValidStatementSegment(0, 0);
validStatementSegment.setSqlStatement(selectStatement);
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateProcedureSupportedCheckerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateProcedureSupportedCheckerTest.java
index d3d5300e1be..61fd0da1ea4 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateProcedureSupportedCheckerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateProcedureSupportedCheckerTest.java
@@ -33,7 +33,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateT
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.statement.mysql.ddl.MySQLCreateProcedureStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
@@ -55,7 +54,7 @@ class ShardingCreateProcedureSupportedCheckerTest {
@Test
void assertCheck() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("bar_tbl"))));
CreateTableStatement createTableStatement = mock(CreateTableStatement.class);
when(createTableStatement.getTable()).thenReturn(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_tbl"))));
@@ -78,7 +77,7 @@ class ShardingCreateProcedureSupportedCheckerTest {
@Test
void assertCheckWithShardingTable() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_tbl"))));
ValidStatementSegment validStatementSegment = new ValidStatementSegment(0, 0);
validStatementSegment.setSqlStatement(selectStatement);
@@ -94,7 +93,7 @@ class ShardingCreateProcedureSupportedCheckerTest {
@Test
void assertCheckWithNoSuchTable() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_tbl"))));
ValidStatementSegment validStatementSegment = new ValidStatementSegment(0, 0);
validStatementSegment.setSqlStatement(selectStatement);
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingInsertSupportedCheckerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingInsertSupportedCheckerTest.java
index 7e96c9c9afb..df72f883920 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingInsertSupportedCheckerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingInsertSupportedCheckerTest.java
@@ -39,7 +39,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Answers;
@@ -137,7 +136,7 @@ class ShardingInsertSupportedCheckerTest {
private InsertStatement createInsertSelectStatement() {
InsertStatement result = createInsertStatement();
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
when(result.getInsertSelect()).thenReturn(Optional.of(new SubquerySegment(0, 0, selectStatement, "")));
return result;
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
index ec44f0972bd..b7d5fe05560 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
@@ -39,7 +39,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.FetchSt
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Collections;
@@ -57,7 +56,7 @@ class ShardingResultMergerEngineTest {
@Test
void assertNewInstanceWithSelectStatement() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
selectStatement.setProjections(new ProjectionsSegment(0, 0));
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/common/IteratorStreamMergedResultTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/common/IteratorStreamMergedResultTest.java
index 0541cebf782..457e3c6f0f2 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/common/IteratorStreamMergedResultTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/common/IteratorStreamMergedResultTest.java
@@ -31,7 +31,6 @@ import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.sharding.merge.dql.ShardingDQLResultMerger;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ProjectionsSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -60,7 +59,7 @@ class IteratorStreamMergedResultTest {
@BeforeEach
void setUp() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatementContext = new SelectStatementContext(databaseType, selectStatement, Collections.emptyList(), createShardingSphereMetaData(), "foo_db", Collections.emptyList());
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
index 9dadcde35fc..ebd3885c7c0 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
@@ -31,7 +31,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.Gro
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.OrderBySegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.item.IndexOrderByItemSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.sql.ResultSet;
@@ -56,7 +55,7 @@ class GroupByRowComparatorTest {
@Test
void assertCompareToForAscWithOrderByItems() throws SQLException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
selectStatement.setGroupBy(new GroupBySegment(0, 0, Arrays.asList(
@@ -76,7 +75,7 @@ class GroupByRowComparatorTest {
@Test
void assertCompareToForDescWithOrderByItems() throws SQLException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
selectStatement.setGroupBy(new GroupBySegment(0, 0, Arrays.asList(
@@ -96,7 +95,7 @@ class GroupByRowComparatorTest {
@Test
void assertCompareToForEqualWithOrderByItems() throws SQLException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
selectStatement.setGroupBy(new GroupBySegment(0, 0, Arrays.asList(
@@ -116,7 +115,7 @@ class GroupByRowComparatorTest {
@Test
void assertCompareToForAscWithGroupByItems() throws SQLException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
selectStatement.setGroupBy(new GroupBySegment(0, 0, Arrays.asList(
@@ -134,7 +133,7 @@ class GroupByRowComparatorTest {
@Test
void assertCompareToForDescWithGroupByItems() throws SQLException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
selectStatement.setGroupBy(new GroupBySegment(0, 0, Arrays.asList(
@@ -156,7 +155,7 @@ class GroupByRowComparatorTest {
@Test
void assertCompareToForEqualWithGroupByItems() throws SQLException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
selectStatement.setGroupBy(new GroupBySegment(0, 0, Arrays.asList(
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
index b0accde0ff2..c2a20ad6029 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
@@ -42,7 +42,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -67,7 +66,7 @@ class OrderByStreamMergedResultTest {
@BeforeEach
void setUp() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
SimpleTableSegment tableSegment = new SimpleTableSegment(new TableNameSegment(10, 13, new IdentifierValue("tbl")));
selectStatement.setFrom(tableSegment);
ProjectionsSegment projectionsSegment = new ProjectionsSegment(0, 0);
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValueTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValueTest.java
index 530f6ba38c1..96aa07865af 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValueTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValueTest.java
@@ -40,7 +40,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.ite
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.item.OrderByItemSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import org.mockito.internal.configuration.plugins.Plugins;
@@ -62,7 +61,7 @@ class OrderByValueTest {
@Test
void assertCompareToForAsc() throws SQLException, NoSuchFieldException, IllegalAccessException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ProjectionsSegment projectionsSegment = new ProjectionsSegment(0, 0);
selectStatement.setProjections(projectionsSegment);
selectStatement.setOrderBy(createOrderBySegment());
@@ -96,7 +95,7 @@ class OrderByValueTest {
@Test
void assertCompareToForDesc() throws SQLException, NoSuchFieldException, IllegalAccessException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ProjectionsSegment projectionsSegment = new ProjectionsSegment(0, 0);
selectStatement.setProjections(projectionsSegment);
selectStatement.setOrderBy(createOrderBySegment());
@@ -125,7 +124,7 @@ class OrderByValueTest {
@Test
void assertCompareToWhenEqual() throws SQLException, NoSuchFieldException, IllegalAccessException {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ProjectionsSegment projectionsSegment = new ProjectionsSegment(0, 0);
selectStatement.setProjections(projectionsSegment);
selectStatement.setOrderBy(createOrderBySegment());
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/LimitDecoratorMergedResultTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/LimitDecoratorMergedResultTest.java
index 75aa0464c83..883697b7357 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/LimitDecoratorMergedResultTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/LimitDecoratorMergedResultTest.java
@@ -30,7 +30,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.Proj
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.limit.LimitSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.limit.NumberLiteralLimitValueSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.sql.SQLException;
@@ -51,7 +50,7 @@ class LimitDecoratorMergedResultTest {
void assertNextForSkipAll() throws SQLException {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.setLimit(new LimitSegment(0, 0, new NumberLiteralLimitValueSegment(0, 0, Long.MAX_VALUE), null));
SelectStatementContext selectStatementContext = new SelectStatementContext(
@@ -66,7 +65,7 @@ class LimitDecoratorMergedResultTest {
void assertNextWithoutRowCount() throws SQLException {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.setLimit(new LimitSegment(0, 0, new NumberLiteralLimitValueSegment(0, 0, 2L), null));
SelectStatementContext selectStatementContext = new SelectStatementContext(
@@ -84,7 +83,7 @@ class LimitDecoratorMergedResultTest {
void assertNextWithRowCount() throws SQLException {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.setLimit(new LimitSegment(0, 0, new NumberLiteralLimitValueSegment(0, 0, 2L), new NumberLiteralLimitValueSegment(0, 0, 2L)));
SelectStatementContext selectStatementContext = new SelectStatementContext(
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingRemoveTokenGeneratorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingRemoveTokenGeneratorTest.java
index 55d5fb9f18a..6e1a5b93fb0 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingRemoveTokenGeneratorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingRemoveTokenGeneratorTest.java
@@ -34,7 +34,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Collection;
@@ -78,7 +77,7 @@ class ShardingRemoveTokenGeneratorTest {
}
private SelectStatementContext createSelectStatementContext() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_user"))));
selectStatement.setGroupBy(new GroupBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, NullsOrderType.FIRST))));
selectStatement.setProjections(createProjectionsSegment());
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/groupby/engine/GroupByContextEngineTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/groupby/engine/GroupByContextEngineTest.java
index a42969cd405..73d7cc174eb 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/groupby/engine/GroupByContextEngineTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/groupby/engine/GroupByContextEngineTest.java
@@ -28,7 +28,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.ite
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.item.OrderByItemSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -41,14 +40,14 @@ class GroupByContextEngineTest {
@Test
void assertCreateGroupByContextWithoutGroupBy() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
GroupByContext actualGroupByContext = new GroupByContextEngine().createGroupByContext(selectStatement);
assertTrue(actualGroupByContext.getItems().isEmpty());
}
@Test
void assertCreateGroupByContextWithGroupBy() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
OrderByItemSegment columnOrderByItemSegment = new ColumnOrderByItemSegment(new ColumnSegment(0, 1, new IdentifierValue("column1")), OrderDirection.ASC, NullsOrderType.LAST);
OrderByItemSegment indexOrderByItemSegment1 = new IndexOrderByItemSegment(1, 2, 2, OrderDirection.ASC, NullsOrderType.LAST);
OrderByItemSegment indexOrderByItemSegment2 = new IndexOrderByItemSegment(2, 3, 3, OrderDirection.ASC, NullsOrderType.LAST);
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/engine/OrderByContextEngineTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/engine/OrderByContextEngineTest.java
index 660c369a63c..37cb0aaea28 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/engine/OrderByContextEngineTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/orderby/engine/OrderByContextEngineTest.java
@@ -34,7 +34,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.ite
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.item.OrderByItemSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -53,7 +52,7 @@ class OrderByContextEngineTest {
@Test
void assertCreateOrderByWithoutOrderBy() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
OrderByItem orderByItem1 = new OrderByItem(new IndexOrderByItemSegment(0, 1, 1, OrderDirection.ASC, NullsOrderType.LAST));
OrderByItem orderByItem2 = new OrderByItem(new IndexOrderByItemSegment(1, 2, 2, OrderDirection.ASC, NullsOrderType.LAST));
Collection<OrderByItem> orderByItems = Arrays.asList(orderByItem1, orderByItem2);
@@ -65,7 +64,7 @@ class OrderByContextEngineTest {
@Test
void assertCreateOrderByWithOrderBy() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
OrderByItemSegment columnOrderByItemSegment = new ColumnOrderByItemSegment(new ColumnSegment(0, 1, new IdentifierValue("column1")), OrderDirection.ASC, NullsOrderType.FIRST);
OrderByItemSegment indexOrderByItemSegment1 = new IndexOrderByItemSegment(1, 2, 2, OrderDirection.ASC, NullsOrderType.LAST);
OrderByItemSegment indexOrderByItemSegment2 = new IndexOrderByItemSegment(2, 3, 3, OrderDirection.ASC, NullsOrderType.LAST);
@@ -84,7 +83,7 @@ class OrderByContextEngineTest {
@Test
void assertCreateOrderInDistinctByWithoutOrderBy() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ColumnProjectionSegment columnProjectionSegment1 = new ColumnProjectionSegment(new ColumnSegment(0, 1, new IdentifierValue("column1")));
ColumnProjectionSegment columnProjectionSegment2 = new ColumnProjectionSegment(new ColumnSegment(1, 2, new IdentifierValue("column2")));
List<ProjectionSegment> list = Arrays.asList(columnProjectionSegment1, columnProjectionSegment2);
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/pagination/PaginationContextTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/pagination/PaginationContextTest.java
index 5b57f7b9531..8a530a2e77f 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/pagination/PaginationContextTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/pagination/PaginationContextTest.java
@@ -32,7 +32,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.paginatio
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.limit.NumberLiteralLimitValueSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.limit.ParameterMarkerLimitValueSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -136,7 +135,7 @@ class PaginationContextTest {
@Test
void assertGetRevisedRowCount() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
ShardingSphereDatabase database = new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList());
ShardingSphereMetaData metaData = new ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), mock());
@@ -146,7 +145,7 @@ class PaginationContextTest {
@Test
void assertGetRevisedRowCountWithMax() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.setGroupBy(new GroupBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, NullsOrderType.LAST))));
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, NullsOrderType.LAST))));
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/pagination/engine/PaginationContextEngineTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/pagination/engine/PaginationContextEngineTest.java
index 15e78b032b8..a9fc663e005 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/pagination/engine/PaginationContextEngineTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/pagination/engine/PaginationContextEngineTest.java
@@ -29,7 +29,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.paginatio
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.top.TopProjectionSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.sqlserver.dml.SQLServerSelectStatement;
import org.junit.jupiter.api.Test;
@@ -45,7 +44,7 @@ class PaginationContextEngineTest {
@Test
void assertCreatePaginationContextWhenLimitSegmentIsPresent() {
- SQL92SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setLimit(new LimitSegment(0, 10, new NumberLiteralLimitValueSegment(0, 10, 100L),
new NumberLiteralLimitValueSegment(0, 10, 100L)));
PaginationContext paginationContext = new PaginationContextEngine(getDatabaseType("SQL92")).createPaginationContext(
@@ -83,7 +82,7 @@ class PaginationContextEngineTest {
@Test
void assertCreatePaginationContextWhenResultIsPaginationContext() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
ProjectionsContext projectionsContext = new ProjectionsContext(0, 0, false, Collections.emptyList());
assertThat(new PaginationContextEngine(getDatabaseType("SQL92")).createPaginationContext(
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactoryTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactoryTest.java
index fa4ebe0d360..892d7c4613f 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactoryTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactoryTest.java
@@ -44,7 +44,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.MoveSta
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Collections;
@@ -62,7 +61,7 @@ class SQLStatementContextFactoryTest {
@Test
void assertSQLStatementContextCreatedWhenSQLStatementInstanceOfSelectStatement() {
ProjectionsSegment projectionsSegment = new ProjectionsSegment(0, 0);
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setLimit(new LimitSegment(0, 10, null, null));
selectStatement.setProjections(projectionsSegment);
SQLStatementContext sqlStatementContext = new SQLBindEngine(mockMetaData(), "foo_db", new HintValueContext()).bind(databaseType, selectStatement, Collections.emptyList());
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContextTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContextTest.java
index 9548d64d73c..efdb5947e72 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContextTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContextTest.java
@@ -29,7 +29,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertS
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.UpdateStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -65,7 +64,7 @@ class PrepareStatementContextTest {
}
private SelectStatement getSelect(final SimpleTableSegment table) {
- SelectStatement result = new SQL92SelectStatement();
+ SelectStatement result = new SelectStatement();
result.setFrom(table);
return result;
}
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
index 739239fff2f..d3b7780e790 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
@@ -40,7 +40,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@@ -132,7 +131,7 @@ class InsertStatementContextTest {
@Test
void assertInsertSelect() {
InsertStatement insertStatement = new InsertStatement();
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.addParameterMarkerSegments(Collections.singleton(new ParameterMarkerExpressionSegment(0, 0, 0, ParameterMarkerType.QUESTION)));
selectStatement.setProjections(new ProjectionsSegment(0, 0));
SubquerySegment insertSelect = new SubquerySegment(0, 0, selectStatement, "");
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContextTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContextTest.java
index 6db13d9d5fc..c6e0f471458 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContextTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContextTest.java
@@ -58,7 +58,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.statement.mysql.dml.MySQLSelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -86,7 +85,7 @@ class SelectStatementContextTest {
@Test
void assertSetIndexForItemsByIndexOrderBy() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(createOrderByItemSegment(INDEX_ORDER_BY))));
selectStatement.setProjections(createProjectionsSegment());
TableNameSegment tableNameSegment = new TableNameSegment(0, 0, new IdentifierValue("table"));
@@ -110,7 +109,7 @@ class SelectStatementContextTest {
@Test
void assertSetIndexForItemsByColumnOrderByWithOwner() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(createOrderByItemSegment(COLUMN_ORDER_BY_WITH_OWNER))));
selectStatement.setProjections(createProjectionsSegment());
TableNameSegment tableNameSegment = new TableNameSegment(0, 0, new IdentifierValue("table"));
@@ -127,7 +126,7 @@ class SelectStatementContextTest {
@Test
void assertSetIndexForItemsByColumnOrderByWithAlias() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mockDatabase();
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(createOrderByItemSegment(COLUMN_ORDER_BY_WITH_ALIAS))));
selectStatement.setProjections(createProjectionsSegment());
@@ -139,7 +138,7 @@ class SelectStatementContextTest {
@Test
void assertSetIndexForItemsByColumnOrderByWithoutAlias() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ShardingSphereDatabase database = mockDatabase();
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(createOrderByItemSegment(COLUMN_ORDER_BY_WITHOUT_OWNER_ALIAS))));
selectStatement.setProjections(createProjectionsSegment());
@@ -151,7 +150,7 @@ class SelectStatementContextTest {
@Test
void assertIsSameGroupByAndOrderByItems() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.setGroupBy(new GroupBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, NullsOrderType.LAST))));
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, NullsOrderType.LAST))));
@@ -167,7 +166,7 @@ class SelectStatementContextTest {
@Test
void assertIsNotSameGroupByAndOrderByItemsWhenEmptyGroupBy() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
SelectStatementContext selectStatementContext = createSelectStatementContext(selectStatement);
assertFalse(selectStatementContext.isSameGroupByAndOrderByItems());
@@ -175,7 +174,7 @@ class SelectStatementContextTest {
@Test
void assertIsNotSameGroupByAndOrderByItemsWhenDifferentGroupByAndOrderBy() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.setGroupBy(new GroupBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, NullsOrderType.LAST))));
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, NullsOrderType.LAST))));
@@ -185,7 +184,7 @@ class SelectStatementContextTest {
@Test
void assertSetIndexWhenAggregationProjectionsPresent() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setOrderBy(new OrderBySegment(0, 0, Collections.singletonList(createOrderByItemSegment(COLUMN_ORDER_BY_WITHOUT_OWNER_ALIAS))));
ProjectionsSegment projectionsSegment = new ProjectionsSegment(0, 0);
AggregationProjectionSegment aggregationProjectionSegment = new AggregationProjectionSegment(0, 0, AggregationType.MAX, "MAX(id)");
@@ -201,7 +200,7 @@ class SelectStatementContextTest {
@Test
void assertSetWhere() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
WhereSegment whereSegment = mock(WhereSegment.class, RETURNS_DEEP_STUBS);
selectStatement.setWhere(whereSegment);
ShardingSphereDatabase database = mockDatabase();
@@ -216,7 +215,7 @@ class SelectStatementContextTest {
@Test
void assertContainsSubquery() {
- SelectStatement subSelectStatement = new SQL92SelectStatement();
+ SelectStatement subSelectStatement = new SelectStatement();
WhereSegment whereSegment = new WhereSegment(0, 0, mock(BinaryOperationExpression.class, RETURNS_DEEP_STUBS));
subSelectStatement.setWhere(whereSegment);
ProjectionsSegment subqueryProjections = new ProjectionsSegment(0, 0);
@@ -226,7 +225,7 @@ class SelectStatementContextTest {
SubquerySegment subquerySegment = new SubquerySegment(0, 0, subSelectStatement, "");
SubqueryProjectionSegment subqueryProjectionSegment = new SubqueryProjectionSegment(subquerySegment, "");
projectionsSegment.getProjections().add(subqueryProjectionSegment);
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(projectionsSegment);
ShardingSphereDatabase database = mockDatabase();
assertTrue(new SelectStatementContext(databaseType, selectStatement, Collections.emptyList(), createShardingSphereMetaData(database), "foo_db", Collections.emptyList()).isContainsSubquery());
@@ -234,7 +233,7 @@ class SelectStatementContextTest {
@Test
void assertContainsSubqueryWhereEmpty() {
- SelectStatement subSelectStatement = new SQL92SelectStatement();
+ SelectStatement subSelectStatement = new SelectStatement();
ColumnSegment left = new ColumnSegment(0, 10, new IdentifierValue("id"));
LiteralExpressionSegment right = new LiteralExpressionSegment(0, 0, 20);
BinaryOperationExpression expression = new BinaryOperationExpression(0, 0, left, right, "=", null);
@@ -246,7 +245,7 @@ class SelectStatementContextTest {
SubqueryExpressionSegment subqueryExpressionSegment = new SubqueryExpressionSegment(new SubquerySegment(0, 0, subSelectStatement, ""));
SubqueryProjectionSegment projectionSegment = mock(SubqueryProjectionSegment.class);
WhereSegment whereSegment = new WhereSegment(0, 0, subqueryExpressionSegment);
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setWhere(whereSegment);
SubquerySegment subquerySegment = new SubquerySegment(0, 0, subSelectStatement, "");
when(projectionSegment.getSubquery()).thenReturn(subquerySegment);
@@ -260,7 +259,7 @@ class SelectStatementContextTest {
@Test
void assertContainsDollarParameterMarker() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ProjectionsSegment projectionsSegment = new ProjectionsSegment(0, 0);
projectionsSegment.getProjections().add(new ParameterMarkerExpressionSegment(0, 0, 0, ParameterMarkerType.DOLLAR));
selectStatement.setProjections(projectionsSegment);
@@ -278,7 +277,7 @@ class SelectStatementContextTest {
@Test
void assertContainsPartialDistinctAggregation() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ProjectionsSegment projectionsSegment = new ProjectionsSegment(0, 0);
projectionsSegment.getProjections().add(new AggregationProjectionSegment(0, 0, AggregationType.COUNT, "COUNT(*)"));
projectionsSegment.getProjections().add(new AggregationDistinctProjectionSegment(0, 10, AggregationType.COUNT, "COUNT(1)", "distinctExpression"));
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/ExistsSubqueryExpressionBinderTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/ExistsSubqueryExpressionBinderTest.java
index 13b3b6ef712..53930798ad8 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/ExistsSubqueryExpressionBinderTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/ExistsSubqueryExpressionBinderTest.java
@@ -25,7 +25,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.Exis
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.subquery.SubquerySegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ProjectionsSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -36,7 +35,7 @@ class ExistsSubqueryExpressionBinderTest {
@Test
void assertBindExistsSubqueryExpression() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
ExistsSubqueryExpression existsSubqueryExpression = new ExistsSubqueryExpression(0, 0, new SubquerySegment(0, 0, selectStatement, "t_test"));
SQLStatementBinderContext binderContext = new SQLStatementBinderContext(mock(ShardingSphereMetaData.class), "foo_db", new HintValueContext(), mock(), mock());
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/SubquerySegmentBinderTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/SubquerySegmentBinderTest.java
index 14869142a02..6335e5c8247 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/SubquerySegmentBinderTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/expression/type/SubquerySegmentBinderTest.java
@@ -43,7 +43,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.sql.Types;
@@ -65,7 +64,7 @@ class SubquerySegmentBinderTest {
@Test
void assertBind() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ColumnSegment columnSegment = new ColumnSegment(58, 65, new IdentifierValue("order_id"));
ProjectionsSegment projectionsSegment = new ProjectionsSegment(58, 65);
projectionsSegment.getProjections().add(new ColumnProjectionSegment(columnSegment));
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinderTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinderTest.java
index e0c131a5015..43badd205e4 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinderTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinderTest.java
@@ -37,7 +37,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.sql.Types;
@@ -101,7 +100,7 @@ class InsertStatementBinderTest {
insertStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
insertStatement.setInsertColumns(new InsertColumnsSegment(0, 0, Arrays.asList(new ColumnSegment(0, 0, new IdentifierValue("order_id")),
new ColumnSegment(0, 0, new IdentifierValue("user_id")), new ColumnSegment(0, 0, new IdentifierValue("status")))));
- SelectStatement subSelectStatement = new SQL92SelectStatement();
+ SelectStatement subSelectStatement = new SelectStatement();
subSelectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
ProjectionsSegment projections = new ProjectionsSegment(0, 0);
projections.getProjections().add(new ColumnProjectionSegment(new ColumnSegment(0, 0, new IdentifierValue("order_id"))));
@@ -125,7 +124,7 @@ class InsertStatementBinderTest {
void assertBindInsertSelectWithoutColumns() {
InsertStatement insertStatement = new InsertStatement();
insertStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
- SelectStatement subSelectStatement = new SQL92SelectStatement();
+ SelectStatement subSelectStatement = new SelectStatement();
subSelectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
ProjectionsSegment projections = new ProjectionsSegment(0, 0);
projections.getProjections().add(new ColumnProjectionSegment(new ColumnSegment(0, 0, new IdentifierValue("order_id"))));
diff --git a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinderTest.java b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinderTest.java
index bc5aca0a4ed..d677d5287c9 100644
--- a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinderTest.java
+++ b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinderTest.java
@@ -36,7 +36,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import java.sql.Types;
@@ -59,7 +58,7 @@ class SelectStatementBinderTest {
@Test
void assertBind() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
ProjectionsSegment projections = new ProjectionsSegment(0, 0);
selectStatement.setProjections(projections);
ColumnProjectionSegment orderIdProjection = new ColumnProjectionSegment(new ColumnSegment(0, 0, new IdentifierValue("order_id")));
diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java
index 9cb1c736718..f2d78f9d401 100644
--- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java
+++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/util/AutoCommitUtilsTest.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateTableStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -33,7 +32,7 @@ class AutoCommitUtilsTest {
@Test
void assertNeedOpenTransactionForSelectStatement() {
- SelectStatement selectStatement = new SQL92SelectStatement();
+ SelectStatement selectStatement = new SelectStatement();
assertFalse(AutoCommitUtils.needOpenTransaction(selectStatement));
selectStatement.setFrom(mock(SimpleTableSegment.class));
assertTrue(AutoCommitUtils.needOpenTransaction(selectStatement));
diff --git a/parser/sql/dialect/sql92/pom.xml b/parser/sql/dialect/sql92/pom.xml
index 1edaeae7685..e5261464a4e 100644
--- a/parser/sql/dialect/sql92/pom.xml
+++ b/parser/sql/dialect/sql92/pom.xml
@@ -36,10 +36,5 @@
<artifactId>shardingsphere-infra-database-sql92</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-statement-sql92</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
index 16645619d72..105f9c197a5 100644
--- a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
+++ b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
@@ -86,11 +86,11 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.DeleteStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.UpdateStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.collection.CollectionValue;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.BooleanLiteralValue;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
import java.util.Collection;
import java.util.Collections;
@@ -207,7 +207,7 @@ public final class SQL92DMLStatementVisitor extends SQL92StatementVisitor implem
@Override
public ASTNode visitSelect(final SelectContext ctx) {
// TODO :Unsupported for withClause.
- SQL92SelectStatement result = (SQL92SelectStatement) visit(ctx.combineClause());
+ SelectStatement result = (SelectStatement) visit(ctx.combineClause());
result.addParameterMarkerSegments(getParameterMarkerSegments());
return result;
}
@@ -220,7 +220,7 @@ public final class SQL92DMLStatementVisitor extends SQL92StatementVisitor implem
@Override
public ASTNode visitSelectClause(final SelectClauseContext ctx) {
- SQL92SelectStatement result = new SQL92SelectStatement();
+ SelectStatement result = new SelectStatement();
result.setProjections((ProjectionsSegment) visit(ctx.projections()));
if (!ctx.selectSpecification().isEmpty()) {
result.getProjections().setDistinctRow(isDistinct(ctx.selectSpecification().get(0)));
@@ -403,7 +403,7 @@ public final class SQL92DMLStatementVisitor extends SQL92StatementVisitor implem
@Override
public ASTNode visitTableFactor(final TableFactorContext ctx) {
if (null != ctx.subquery()) {
- SQL92SelectStatement subquery = (SQL92SelectStatement) visit(ctx.subquery());
+ SelectStatement subquery = (SelectStatement) visit(ctx.subquery());
SubquerySegment subquerySegment = new SubquerySegment(ctx.subquery().start.getStartIndex(), ctx.subquery().stop.getStopIndex(), subquery, getOriginalText(ctx.subquery()));
SubqueryTableSegment result = new SubqueryTableSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), subquerySegment);
if (null != ctx.alias()) {
diff --git a/parser/sql/engine/pom.xml b/parser/sql/engine/pom.xml
index b220920eb01..0afae4c2191 100644
--- a/parser/sql/engine/pom.xml
+++ b/parser/sql/engine/pom.xml
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-statement-sql92</artifactId>
+ <artifactId>shardingsphere-parser-sql-statement-core</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dml/SelectStatement.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dml/SelectStatement.java
index 810e2f99d20..f1f03a7de7f 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dml/SelectStatement.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dml/SelectStatement.java
@@ -61,6 +61,8 @@ public class SelectStatement extends AbstractSQLStatement implements DMLStatemen
private SubqueryType subqueryType;
+ private LimitSegment limit;
+
/**
* Get from.
*
@@ -139,15 +141,7 @@ public class SelectStatement extends AbstractSQLStatement implements DMLStatemen
* @return limit segment
*/
public Optional<LimitSegment> getLimit() {
- return Optional.empty();
- }
-
- /**
- * Set limit segment.
- *
- * @param limitSegment limit segment
- */
- public void setLimit(final LimitSegment limitSegment) {
+ return Optional.ofNullable(limit);
}
/**
diff --git a/parser/sql/statement/type/pom.xml b/parser/sql/statement/type/pom.xml
index 6f6102af2df..0609179aae5 100644
--- a/parser/sql/statement/type/pom.xml
+++ b/parser/sql/statement/type/pom.xml
@@ -36,7 +36,6 @@
<module>oracle</module>
<module>postgresql</module>
<module>presto</module>
- <module>sql92</module>
<module>sqlserver</module>
</modules>
</project>
diff --git a/parser/sql/statement/type/sql92/pom.xml b/parser/sql/statement/type/sql92/pom.xml
deleted file mode 100644
index a82c81682af..00000000000
--- a/parser/sql/statement/type/sql92/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-statement-type</artifactId>
- <version>5.5.3-SNAPSHOT</version>
- </parent>
- <artifactId>shardingsphere-parser-sql-statement-sql92</artifactId>
- <name>${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-statement-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/parser/sql/statement/type/sql92/src/main/java/org/apache/shardingsphere/sql/parser/statement/sql92/SQL92Statement.java b/parser/sql/statement/type/sql92/src/main/java/org/apache/shardingsphere/sql/parser/statement/sql92/SQL92Statement.java
deleted file mode 100644
index a84198ec246..00000000000
--- a/parser/sql/statement/type/sql92/src/main/java/org/apache/shardingsphere/sql/parser/statement/sql92/SQL92Statement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.sql.parser.statement.sql92;
-
-import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
-
-/**
- * SQL92 statement.
- */
-public interface SQL92Statement extends SQLStatement {
-}
diff --git a/parser/sql/statement/type/sql92/src/main/java/org/apache/shardingsphere/sql/parser/statement/sql92/dml/SQL92SelectStatement.java b/parser/sql/statement/type/sql92/src/main/java/org/apache/shardingsphere/sql/parser/statement/sql92/dml/SQL92SelectStatement.java
deleted file mode 100644
index 15a060e88eb..00000000000
--- a/parser/sql/statement/type/sql92/src/main/java/org/apache/shardingsphere/sql/parser/statement/sql92/dml/SQL92SelectStatement.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.sql.parser.statement.sql92.dml;
-
-import lombok.Setter;
-import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.limit.LimitSegment;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
-import org.apache.shardingsphere.sql.parser.statement.sql92.SQL92Statement;
-
-import java.util.Optional;
-
-/**
- * SQL92 select statement.
- */
-@Setter
-public final class SQL92SelectStatement extends SelectStatement implements SQL92Statement {
-
- private LimitSegment limit;
-
- @Override
- public Optional<LimitSegment> getLimit() {
- return Optional.ofNullable(limit);
- }
-}
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/sane/SaneQueryResultEngineTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/sane/SaneQueryResultEngineTest.java
index 9a32128d6b9..27a9fba59d6 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/sane/SaneQueryResultEngineTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/sane/SaneQueryResultEngineTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.type.RawMemoryQueryResult;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.sql.parser.statement.sql92.dml.SQL92SelectStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.junit.jupiter.api.Test;
import java.util.Optional;
@@ -37,7 +37,7 @@ class SaneQueryResultEngineTest {
@Test
void assertGetSaneQueryResultForSelectStatement() {
SaneQueryResultEngine saneQueryResultEngine = new SaneQueryResultEngine(TypedSPILoader.getService(DatabaseType.class, "FIXTURE"));
- Optional<ExecuteResult> actual = saneQueryResultEngine.getSaneQueryResult(new SQL92SelectStatement(), null);
+ Optional<ExecuteResult> actual = saneQueryResultEngine.getSaneQueryResult(new SelectStatement(), null);
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(RawMemoryQueryResult.class));
RawMemoryQueryResult actualResult = (RawMemoryQueryResult) actual.get();