This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2e654172a58 change "tableSegment" to "table"（keep the naming
consistent） (#19763)
2e654172a58 is described below
commit 2e654172a58d9dc64da951d985be34dd776a5742
Author: skai <[email protected]>
AuthorDate: Tue Aug 2 08:56:13 2022 +0800
change "tableSegment" to "table"（keep the naming consistent） (#19763)
---
.../token/generator/EncryptGeneratorBaseTest.java | 2 +-
.../dml/ShardingDeleteStatementValidatorTest.java | 2 +-
.../dml/ShardingUpdateStatementValidatorTest.java | 6 +++---
.../statement/ddl/PrepareStatementContextTest.java | 4 ++--
.../binder/statement/dml/DeleteStatementContextTest.java | 2 +-
.../binder/statement/dml/UpdateStatementContextTest.java | 2 +-
.../visitor/statement/impl/MySQLStatementSQLVisitor.java | 6 +++---
.../statement/impl/OpenGaussStatementSQLVisitor.java | 4 ++--
.../statement/impl/OracleDMLStatementSQLVisitor.java | 8 ++++----
.../statement/impl/PostgreSQLStatementSQLVisitor.java | 4 ++--
.../statement/impl/SQL92DMLStatementSQLVisitor.java | 4 ++--
.../statement/impl/SQLServerStatementSQLVisitor.java | 6 +++---
.../sql/parser/sql/common/extractor/TableExtractor.java | 4 ++--
.../parser/sql/common/statement/dml/DeleteStatement.java | 2 +-
.../parser/sql/common/statement/dml/UpdateStatement.java | 2 +-
.../statement/dml/impl/DeleteStatementAssert.java | 16 ++++++++--------
.../statement/dml/impl/UpdateStatementAssert.java | 4 ++--
17 files changed, 39 insertions(+), 39 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorBaseTest.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorBaseTest.java
index b2d74dba617..6e8e80cc322 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorBaseTest.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorBaseTest.java
@@ -88,7 +88,7 @@ public abstract class EncryptGeneratorBaseTest {
protected static UpdateStatementContext createUpdatesStatementContext() {
MySQLUpdateStatement mySQLUpdateStatement = new MySQLUpdateStatement();
- mySQLUpdateStatement.setTableSegment(createTableSegment(TABLE_NAME));
+ mySQLUpdateStatement.setTable(createTableSegment(TABLE_NAME));
mySQLUpdateStatement.setWhere(createWhereSegment());
mySQLUpdateStatement.setSetAssignment(createSetAssignmentSegment());
return new UpdateStatementContext(mySQLUpdateStatement);
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDeleteStatementValidatorTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDeleteStatementValidatorTest.java
index accad17e6b4..e07e27c6e0c 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDeleteStatementValidatorTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDeleteStatementValidatorTest.java
@@ -81,7 +81,7 @@ public final class ShardingDeleteStatementValidatorTest {
tableSegment.getActualDeleteTables().add(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("user"))));
tableSegment.getActualDeleteTables().add(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("order"))));
tableSegment.getActualDeleteTables().add(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("order_item"))));
- sqlStatement.setTableSegment(tableSegment);
+ sqlStatement.setTable(tableSegment);
DeleteStatementContext sqlStatementContext = new
DeleteStatementContext(sqlStatement);
Collection<String> tableNames = new HashSet<>(Arrays.asList("user",
"order", "order_item"));
when(shardingRule.isAllShardingTables(tableNames)).thenReturn(false);
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingUpdateStatementValidatorTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingUpdateStatementValidatorTest.java
index 481df623e9e..d14d00ef956 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingUpdateStatementValidatorTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingUpdateStatementValidatorTest.java
@@ -69,7 +69,7 @@ public final class ShardingUpdateStatementValidatorTest {
@Test
public void assertPreValidateWhenUpdateSingleTable() {
UpdateStatement updateStatement = createUpdateStatement();
- updateStatement.setTableSegment(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("user"))));
+ updateStatement.setTable(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("user"))));
SQLStatementContext<UpdateStatement> sqlStatementContext = new
UpdateStatementContext(updateStatement);
Collection<String> tableNames =
sqlStatementContext.getTablesContext().getTableNames();
when(shardingRule.isAllShardingTables(tableNames)).thenReturn(true);
@@ -83,7 +83,7 @@ public final class ShardingUpdateStatementValidatorTest {
JoinTableSegment joinTableSegment = new JoinTableSegment();
joinTableSegment.setLeft(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("user"))));
joinTableSegment.setRight(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue("order"))));
- updateStatement.setTableSegment(joinTableSegment);
+ updateStatement.setTable(joinTableSegment);
SQLStatementContext<UpdateStatement> sqlStatementContext = new
UpdateStatementContext(updateStatement);
Collection<String> tableNames =
sqlStatementContext.getTablesContext().getTableNames();
when(shardingRule.isAllShardingTables(tableNames)).thenReturn(false);
@@ -158,7 +158,7 @@ public final class ShardingUpdateStatementValidatorTest {
private UpdateStatement createUpdateStatement() {
UpdateStatement result = new MySQLUpdateStatement();
- result.setTableSegment(new SimpleTableSegment(new TableNameSegment(0,
0, new IdentifierValue("user"))));
+ result.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new
IdentifierValue("user"))));
List<ColumnSegment> columns = new LinkedList<>();
columns.add(new ColumnSegment(0, 0, new IdentifierValue("id")));
AssignmentSegment assignment = new ColumnAssignmentSegment(0, 0,
columns, new LiteralExpressionSegment(0, 0, 1));
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/ddl/PrepareStatementContextTest.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/ddl/PrepareStatementContextTest.java
index a6e022c111d..19bd89cc77b 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/ddl/PrepareStatementContextTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/ddl/PrepareStatementContextTest.java
@@ -87,7 +87,7 @@ public final class PrepareStatementContextTest {
private UpdateStatement getUpdate() {
UpdateStatement update = new PostgreSQLUpdateStatement();
- update.setTableSegment(table);
+ update.setTable(table);
SetAssignmentSegment setAssignmentSegment = new
SetAssignmentSegment(0, 0, Collections.singletonList(new
ColumnAssignmentSegment(0, 0, Collections.singletonList(column), column)));
update.setSetAssignment(setAssignmentSegment);
return update;
@@ -95,7 +95,7 @@ public final class PrepareStatementContextTest {
private DeleteStatement getDelete() {
DeleteStatement delete = new PostgreSQLDeleteStatement();
- delete.setTableSegment(table);
+ delete.setTable(table);
return delete;
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dml/DeleteStatementContextTest.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dml/DeleteStatementContextTest.java
index 248e6ec325f..07f1d82c792 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dml/DeleteStatementContextTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dml/DeleteStatementContextTest.java
@@ -83,7 +83,7 @@ public final class DeleteStatementContextTest {
tableSegment.setLeft(table1);
tableSegment.setRight(table2);
deleteStatement.setWhere(whereSegment);
- deleteStatement.setTableSegment(tableSegment);
+ deleteStatement.setTable(tableSegment);
DeleteStatementContext actual = new
DeleteStatementContext(deleteStatement);
assertThat(actual.getTablesContext().getTableNames(), is(new
HashSet<>(Arrays.asList("tbl_1", "tbl_2"))));
assertThat(actual.getWhereSegments(),
is(Collections.singletonList(whereSegment)));
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dml/UpdateStatementContextTest.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dml/UpdateStatementContextTest.java
index 09e82c52656..c03313d9d4d 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dml/UpdateStatementContextTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/dml/UpdateStatementContextTest.java
@@ -64,7 +64,7 @@ public final class UpdateStatementContextTest {
joinTableSegment.setRight(table2);
UpdateStatement updateStatement = new MySQLUpdateStatement();
updateStatement.setWhere(whereSegment);
- updateStatement.setTableSegment(joinTableSegment);
+ updateStatement.setTable(joinTableSegment);
updateStatement.setSetAssignment(new SetAssignmentSegment(0, 0,
Collections.emptyList()));
UpdateStatementContext actual = new
UpdateStatementContext(updateStatement);
assertThat(actual.getTablesContext().getTableNames(), is(new
HashSet<>(Arrays.asList("tbl_1", "tbl_2"))));
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
index f5de81e2796..5cda32848a9 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
@@ -1210,7 +1210,7 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
public ASTNode visitUpdate(final UpdateContext ctx) {
MySQLUpdateStatement result = new MySQLUpdateStatement();
TableSegment tableSegment = (TableSegment)
visit(ctx.tableReferences());
- result.setTableSegment(tableSegment);
+ result.setTable(tableSegment);
result.setSetAssignment((SetAssignmentSegment)
visit(ctx.setAssignmentsClause()));
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
@@ -1276,9 +1276,9 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
public ASTNode visitDelete(final DeleteContext ctx) {
MySQLDeleteStatement result = new MySQLDeleteStatement();
if (null != ctx.multipleTablesClause()) {
- result.setTableSegment((TableSegment)
visit(ctx.multipleTablesClause()));
+ result.setTable((TableSegment) visit(ctx.multipleTablesClause()));
} else {
- result.setTableSegment((TableSegment)
visit(ctx.singleTableClause()));
+ result.setTable((TableSegment) visit(ctx.singleTableClause()));
}
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
index f7d8c43c3be..d29ff63584d 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
@@ -782,7 +782,7 @@ public abstract class OpenGaussStatementSQLVisitor extends
OpenGaussStatementBas
public ASTNode visitUpdate(final UpdateContext ctx) {
OpenGaussUpdateStatement result = new OpenGaussUpdateStatement();
SimpleTableSegment tableSegment = (SimpleTableSegment)
visit(ctx.relationExprOptAlias());
- result.setTableSegment(tableSegment);
+ result.setTable(tableSegment);
result.setSetAssignment((SetAssignmentSegment)
visit(ctx.setClauseList()));
if (null != ctx.whereOrCurrentClause()) {
result.setWhere((WhereSegment) visit(ctx.whereOrCurrentClause()));
@@ -802,7 +802,7 @@ public abstract class OpenGaussStatementSQLVisitor extends
OpenGaussStatementBas
public ASTNode visitDelete(final DeleteContext ctx) {
OpenGaussDeleteStatement result = new OpenGaussDeleteStatement();
SimpleTableSegment tableSegment = (SimpleTableSegment)
visit(ctx.relationExprOptAlias());
- result.setTableSegment(tableSegment);
+ result.setTable(tableSegment);
if (null != ctx.whereOrCurrentClause()) {
result.setWhere((WhereSegment) visit(ctx.whereOrCurrentClause()));
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDMLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDMLStatementSQLVisitor.java
index 05ffb7207a7..303838281da 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDMLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDMLStatementSQLVisitor.java
@@ -309,9 +309,9 @@ public final class OracleDMLStatementSQLVisitor extends
OracleStatementSQLVisito
@Override
public ASTNode visitUpdate(final UpdateContext ctx) {
OracleUpdateStatement result = new OracleUpdateStatement();
- result.setTableSegment((TableSegment)
visit(ctx.updateSpecification()));
+ result.setTable((TableSegment) visit(ctx.updateSpecification()));
if (null != ctx.alias()) {
- result.getTableSegment().setAlias((AliasSegment)
visit(ctx.alias()));
+ result.getTable().setAlias((AliasSegment) visit(ctx.alias()));
}
result.setSetAssignment((SetAssignmentSegment)
visit(ctx.updateSetClause()));
if (null != ctx.whereClause()) {
@@ -424,9 +424,9 @@ public final class OracleDMLStatementSQLVisitor extends
OracleStatementSQLVisito
@Override
public ASTNode visitDelete(final DeleteContext ctx) {
OracleDeleteStatement result = new OracleDeleteStatement();
- result.setTableSegment((TableSegment)
visit(ctx.deleteSpecification()));
+ result.setTable((TableSegment) visit(ctx.deleteSpecification()));
if (null != ctx.alias()) {
- result.getTableSegment().setAlias((AliasSegment)
visit(ctx.alias()));
+ result.getTable().setAlias((AliasSegment) visit(ctx.alias()));
}
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
index 12b090e6209..80ef5ff3858 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
@@ -751,7 +751,7 @@ public abstract class PostgreSQLStatementSQLVisitor extends
PostgreSQLStatementP
public ASTNode visitUpdate(final UpdateContext ctx) {
PostgreSQLUpdateStatement result = new PostgreSQLUpdateStatement();
SimpleTableSegment tableSegment = (SimpleTableSegment)
visit(ctx.relationExprOptAlias());
- result.setTableSegment(tableSegment);
+ result.setTable(tableSegment);
result.setSetAssignment((SetAssignmentSegment)
visit(ctx.setClauseList()));
if (null != ctx.whereOrCurrentClause()) {
result.setWhere((WhereSegment) visit(ctx.whereOrCurrentClause()));
@@ -771,7 +771,7 @@ public abstract class PostgreSQLStatementSQLVisitor extends
PostgreSQLStatementP
public ASTNode visitDelete(final DeleteContext ctx) {
PostgreSQLDeleteStatement result = new PostgreSQLDeleteStatement();
SimpleTableSegment tableSegment = (SimpleTableSegment)
visit(ctx.relationExprOptAlias());
- result.setTableSegment(tableSegment);
+ result.setTable(tableSegment);
if (null != ctx.whereOrCurrentClause()) {
result.setWhere((WhereSegment) visit(ctx.whereOrCurrentClause()));
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92DMLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92DMLStatementSQLVisitor.java
index 70059388a15..e3501e56987 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92DMLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/impl/SQL92DMLStatementSQLVisitor.java
@@ -146,7 +146,7 @@ public final class SQL92DMLStatementSQLVisitor extends
SQL92StatementSQLVisitor
@Override
public ASTNode visitUpdate(final UpdateContext ctx) {
SQL92UpdateStatement result = new SQL92UpdateStatement();
- result.setTableSegment((TableSegment) visit(ctx.tableReferences()));
+ result.setTable((TableSegment) visit(ctx.tableReferences()));
result.setSetAssignment((SetAssignmentSegment)
visit(ctx.setAssignmentsClause()));
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
@@ -197,7 +197,7 @@ public final class SQL92DMLStatementSQLVisitor extends
SQL92StatementSQLVisitor
@Override
public ASTNode visitDelete(final DeleteContext ctx) {
SQL92DeleteStatement result = new SQL92DeleteStatement();
- result.setTableSegment((TableSegment) visit(ctx.singleTableClause()));
+ result.setTable((TableSegment) visit(ctx.singleTableClause()));
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
index f9bcb3b3540..78a832a8115 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerStatementSQLVisitor.java
@@ -989,7 +989,7 @@ public abstract class SQLServerStatementSQLVisitor extends
SQLServerStatementBas
if (null != ctx.withClause()) {
result.setWithSegment((WithSegment) visit(ctx.withClause()));
}
- result.setTableSegment((TableSegment) visit(ctx.tableReferences()));
+ result.setTable((TableSegment) visit(ctx.tableReferences()));
result.setSetAssignment((SetAssignmentSegment)
visit(ctx.setAssignmentsClause()));
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
@@ -1044,9 +1044,9 @@ public abstract class SQLServerStatementSQLVisitor
extends SQLServerStatementBas
result.setWithSegment((WithSegment) visit(ctx.withClause()));
}
if (null != ctx.multipleTablesClause()) {
- result.setTableSegment((TableSegment)
visit(ctx.multipleTablesClause()));
+ result.setTable((TableSegment) visit(ctx.multipleTablesClause()));
} else {
- result.setTableSegment((TableSegment)
visit(ctx.singleTableClause()));
+ result.setTable((TableSegment) visit(ctx.singleTableClause()));
}
if (null != ctx.outputClause()) {
result.setOutputSegment((OutputSegment) visit(ctx.outputClause()));
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
index 0ff5735c2fc..a7db444cb49 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
@@ -203,7 +203,7 @@ public final class TableExtractor {
* @param deleteStatement delete statement
*/
public void extractTablesFromDelete(final DeleteStatement deleteStatement)
{
- extractTablesFromTableSegment(deleteStatement.getTableSegment());
+ extractTablesFromTableSegment(deleteStatement.getTable());
if (deleteStatement.getWhere().isPresent()) {
extractTablesFromExpression(deleteStatement.getWhere().get().getExpr());
}
@@ -248,7 +248,7 @@ public final class TableExtractor {
* @param updateStatement update statement.
*/
public void extractTablesFromUpdate(final UpdateStatement updateStatement)
{
- extractTablesFromTableSegment(updateStatement.getTableSegment());
+ extractTablesFromTableSegment(updateStatement.getTable());
updateStatement.getSetAssignment().getAssignments().forEach(each ->
extractTablesFromExpression(each.getColumns().get(0)));
if (updateStatement.getWhere().isPresent()) {
extractTablesFromExpression(updateStatement.getWhere().get().getExpr());
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/DeleteStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/DeleteStatement.java
index d7375c0ddb7..d25bec72f0c 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/DeleteStatement.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/DeleteStatement.java
@@ -34,7 +34,7 @@ import java.util.Optional;
public abstract class DeleteStatement extends AbstractSQLStatement implements
DMLStatement {
@Getter
- private TableSegment tableSegment;
+ private TableSegment table;
private WhereSegment where;
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/UpdateStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/UpdateStatement.java
index 7500ca32c95..d1063291cdc 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/UpdateStatement.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/UpdateStatement.java
@@ -35,7 +35,7 @@ import java.util.Optional;
@ToString(callSuper = true)
public abstract class UpdateStatement extends AbstractSQLStatement implements
DMLStatement {
- private TableSegment tableSegment;
+ private TableSegment table;
private SetAssignmentSegment setAssignment;
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/DeleteStatementAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/DeleteStatementAssert.java
index bedbe396234..8f17f751053 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/DeleteStatementAssert.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/DeleteStatementAssert.java
@@ -81,20 +81,20 @@ public final class DeleteStatementAssert {
private static void assertTable(final SQLCaseAssertContext assertContext,
final DeleteStatement actual, final DeleteStatementTestCase expected) {
if (null != expected.getTables() && !expected.getTables().isEmpty()) {
- assertNotNull(assertContext.getText("Actual table segment should
exist."), actual.getTableSegment());
+ assertNotNull(assertContext.getText("Actual table segment should
exist."), actual.getTable());
List<SimpleTableSegment> actualTableSegments = new LinkedList<>();
- if (actual.getTableSegment() instanceof SimpleTableSegment) {
- actualTableSegments.add((SimpleTableSegment)
actual.getTableSegment());
- } else if (actual.getTableSegment() instanceof
DeleteMultiTableSegment) {
- DeleteMultiTableSegment deleteMultiTableSegment =
(DeleteMultiTableSegment) actual.getTableSegment();
+ if (actual.getTable() instanceof SimpleTableSegment) {
+ actualTableSegments.add((SimpleTableSegment)
actual.getTable());
+ } else if (actual.getTable() instanceof DeleteMultiTableSegment) {
+ DeleteMultiTableSegment deleteMultiTableSegment =
(DeleteMultiTableSegment) actual.getTable();
actualTableSegments.addAll(deleteMultiTableSegment.getActualDeleteTables());
}
TableAssert.assertIs(assertContext, actualTableSegments,
expected.getTables());
} else if (null != expected.getSubqueryTable()) {
- assertNotNull(assertContext.getText("Actual subquery table segment
should exist."), actual.getTableSegment());
- TableAssert.assertIs(assertContext, (SubqueryTableSegment)
actual.getTableSegment(), expected.getSubqueryTable());
+ assertNotNull(assertContext.getText("Actual subquery table segment
should exist."), actual.getTable());
+ TableAssert.assertIs(assertContext, (SubqueryTableSegment)
actual.getTable(), expected.getSubqueryTable());
} else {
- assertNull(assertContext.getText("Actual table should not
exist."), actual.getTableSegment());
+ assertNull(assertContext.getText("Actual table should not
exist."), actual.getTable());
}
}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/UpdateStatementAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/UpdateStatementAssert.java
index 77a86cc8e6e..548ba03d045 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/UpdateStatementAssert.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/UpdateStatementAssert.java
@@ -61,9 +61,9 @@ public final class UpdateStatementAssert {
private static void assertTable(final SQLCaseAssertContext assertContext,
final UpdateStatement actual, final UpdateStatementTestCase expected) {
if (null != expected.getTable()) {
- TableAssert.assertIs(assertContext, actual.getTableSegment(),
expected.getTable());
+ TableAssert.assertIs(assertContext, actual.getTable(),
expected.getTable());
} else {
- assertNull(assertContext.getText("Actual from should not exist."),
actual.getTableSegment());
+ assertNull(assertContext.getText("Actual from should not exist."),
actual.getTable());
}
}
