You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/06/24 17:11:47 UTC
[shardingsphere] branch master updated: Refactor ifExist and ifNotExist field names with SQLStatement (#18577)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 94318353799 Refactor ifExist and ifNotExist field names with SQLStatement (#18577)
94318353799 is described below
commit 9431835379969bc64035b0e8944d5703646d3f79
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Jun 25 01:11:40 2022 +0800
Refactor ifExist and ifNotExist field names with SQLStatement (#18577)
* Refactor ifExist and ifNotExist field name with SQLStatement
* Refactor ifExist and ifNotExist field name with SQLStatement
---
.../drop/DropDefaultSingleTableRuleStatement.java | 6 ++--
.../statement/rdl/drop/DropResourceStatement.java | 4 +--
.../statement/rdl/drop/DropRuleStatement.java | 6 ++--
...DatabaseDiscoveryHeartbeatStatementUpdater.java | 2 +-
.../DropDatabaseDiscoveryRuleStatementUpdater.java | 2 +-
.../DropDatabaseDiscoveryTypeStatementUpdater.java | 2 +-
...baseDiscoveryHeartbeatStatementUpdaterTest.java | 2 +-
...overyProviderAlgorithmStatementUpdaterTest.java | 4 +--
.../DatabaseDiscoveryDistSQLStatementVisitor.java | 2 +-
.../DropDatabaseDiscoveryHeartbeatStatement.java | 6 ++--
.../DropDatabaseDiscoveryRuleStatement.java | 4 +--
.../DropDatabaseDiscoveryTypeStatement.java | 6 ++--
.../update/DropEncryptRuleStatementUpdater.java | 2 +-
.../DropEncryptRuleStatementUpdaterTest.java | 2 +-
.../parser/statement/DropEncryptRuleStatement.java | 6 ++--
...DropReadwriteSplittingRuleStatementUpdater.java | 4 +--
...ReadwriteSplittingRuleStatementUpdaterTest.java | 2 +-
.../DropReadwriteSplittingRuleStatement.java | 6 ++--
.../ShadowNonDMLStatementRoutingEngineTest.java | 2 +-
...DropDefaultShadowAlgorithmStatementUpdater.java | 4 +--
.../DropShadowAlgorithmStatementUpdater.java | 4 +--
.../update/DropShadowRuleStatementUpdater.java | 4 +--
...DefaultShadowAlgorithmStatementUpdaterTest.java | 4 +--
.../DropShadowAlgorithmStatementUpdaterTest.java | 6 ++--
.../update/DropShadowRuleStatementUpdaterTest.java | 6 ++--
.../DropDefaultShadowAlgorithmStatement.java | 8 ++----
.../statement/DropShadowAlgorithmStatement.java | 6 ++--
.../parser/statement/DropShadowRuleStatement.java | 6 ++--
...ardingCreateFunctionStatementValidatorTest.java | 4 +--
...rdingCreateProcedureStatementValidatorTest.java | 4 +--
.../ShardingCreateTableStatementValidatorTest.java | 20 ++++++--------
.../ShardingDropIndexStatementValidatorTest.java | 12 ++++----
.../ShardingDropTableStatementValidatorTest.java | 10 +++----
.../DropShardingScalingRuleStatementUpdater.java | 4 +--
.../DropDefaultStrategyStatementUpdater.java | 4 +--
.../DropShardingAlgorithmStatementUpdater.java | 4 +--
...opShardingBindingTableRuleStatementUpdater.java | 4 +--
...ShardingBroadcastTableRuleStatementUpdater.java | 4 +--
.../DropShardingKeyGeneratorStatementUpdater.java | 4 +--
.../DropShardingTableRuleStatementUpdater.java | 4 +--
...ropShardingScalingRuleStatementUpdaterTest.java | 2 +-
...efaultShardingStrategyStatementUpdaterTest.java | 4 +--
.../DropShardingAlgorithmStatementUpdaterTest.java | 4 +--
...ardingBindingTableRuleStatementUpdaterTest.java | 6 ++--
...dingBroadcastTableRuleStatementUpdaterTest.java | 6 ++--
...opShardingKeyGeneratorStatementUpdaterTest.java | 2 +-
.../core/ShardingDistSQLStatementVisitor.java | 8 ++----
.../DropShardingScalingRuleStatement.java | 6 ++--
.../DropDefaultShardingStrategyStatement.java | 6 ++--
.../statement/DropShardingAlgorithmStatement.java | 6 ++--
.../DropShardingBindingTableRulesStatement.java | 6 ++--
.../DropShardingBroadcastTableRulesStatement.java | 6 ++--
.../DropShardingKeyGeneratorStatement.java | 6 ++--
.../route/SingleTableSQLRouterTest.java | 2 +-
.../engine/SingleTableStandardRouteEngineTest.java | 4 +--
.../database/CreateDatabaseBackendHandler.java | 2 +-
.../text/database/DropDatabaseBackendHandler.java | 2 +-
.../rdl/resource/DropResourceBackendHandler.java | 2 +-
...DropDefaultSingleTableRuleStatementUpdater.java | 2 +-
.../communication/ProxySQLExecutorTest.java | 4 +--
.../database/CreateDatabaseBackendHandlerTest.java | 2 +-
.../database/DropDatabaseBackendHandlerTest.java | 2 +-
.../prepare/MySQLComStmtPrepareCheckerTest.java | 4 +--
.../impl/MySQLDALStatementSQLVisitor.java | 9 +-----
.../impl/MySQLDDLStatementSQLVisitor.java | 10 +++----
.../impl/OpenGaussDDLStatementSQLVisitor.java | 11 +++-----
.../impl/PostgreSQLDDLStatementSQLVisitor.java | 11 +++-----
.../impl/SQLServerDDLStatementSQLVisitor.java | 18 +++---------
.../statement/ddl/CreateDatabaseStatement.java | 2 +-
.../statement/ddl/DropDatabaseStatement.java | 2 +-
.../handler/ddl/CreateTableStatementHandler.java | 6 ++--
.../handler/ddl/DropIndexStatementHandler.java | 6 ++--
.../handler/ddl/DropTableStatementHandler.java | 8 +++---
.../mysql/dal/MySQLResetPersistStatement.java | 10 +++----
.../mysql/ddl/MySQLCreateTableStatement.java | 6 ++--
.../mysql/ddl/MySQLDropTableStatement.java | 6 ++--
.../ddl/OpenGaussCreateTableStatement.java | 6 ++--
.../opengauss/ddl/OpenGaussDropIndexStatement.java | 6 ++--
.../opengauss/ddl/OpenGaussDropTableStatement.java | 6 ++--
.../ddl/PostgreSQLCreateTableStatement.java | 6 ++--
.../ddl/PostgreSQLDropIndexStatement.java | 6 ++--
.../ddl/PostgreSQLDropTableStatement.java | 6 ++--
.../sqlserver/ddl/SQLServerDropIndexStatement.java | 6 ++--
.../sqlserver/ddl/SQLServerDropTableStatement.java | 6 ++--
.../ddl/CreateTableStatementHandlerTest.java | 32 +++++-----------------
.../handler/ddl/DropIndexStatementHandlerTest.java | 4 +--
.../handler/ddl/DropTableStatementHandlerTest.java | 30 ++++++--------------
.../dal/impl/MySQLResetPersistStatementAssert.java | 2 +-
.../rdl/drop/DropResourceStatementAssert.java | 2 +-
...pDatabaseDiscoveryHeartbeatStatementAssert.java | 2 +-
.../DropDatabaseDiscoveryTypeStatementAssert.java | 2 +-
...DropDefaultShardingStrategyStatementAssert.java | 2 +-
.../impl/DropDefaultSingleTableRuleAssert.java | 2 +-
.../DropReadwriteSplittingRuleStatementAssert.java | 2 +-
.../impl/DropShadowAlgorithmStatementAssert.java | 2 +-
.../drop/impl/DropShadowRuleStatementAssert.java | 2 +-
.../impl/DropShardingAlgorithmStatementAssert.java | 2 +-
...opShardingBindingTableRulesStatementAssert.java | 2 +-
...ShardingBroadcastTableRulesStatementAssert.java | 2 +-
.../DropShardingKeyGeneratorStatementAssert.java | 2 +-
.../DropShardingScalingRuleStatementAssert.java | 2 +-
.../impl/DropShardingTableRuleStatementAssert.java | 2 +-
102 files changed, 223 insertions(+), 316 deletions(-)
diff --git a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropDefaultSingleTableRuleStatement.java b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropDefaultSingleTableRuleStatement.java
index bfd382fd911..e72ea980e13 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropDefaultSingleTableRuleStatement.java
+++ b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropDefaultSingleTableRuleStatement.java
@@ -17,17 +17,15 @@
package org.apache.shardingsphere.distsql.parser.statement.rdl.drop;
-import lombok.Getter;
import lombok.NoArgsConstructor;
/**
* Drop default single table rule statement.
*/
-@Getter
@NoArgsConstructor
public final class DropDefaultSingleTableRuleStatement extends DropRuleStatement {
- public DropDefaultSingleTableRuleStatement(final boolean containsExistClause) {
- super(containsExistClause);
+ public DropDefaultSingleTableRuleStatement(final boolean ifExist) {
+ super(ifExist);
}
}
diff --git a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropResourceStatement.java b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropResourceStatement.java
index 5ee29b3b665..4032c83a0a5 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropResourceStatement.java
+++ b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropResourceStatement.java
@@ -30,14 +30,14 @@ import java.util.Collection;
@Getter
public final class DropResourceStatement extends ResourceDefinitionStatement {
- private final boolean containsExistClause;
+ private final boolean ifExist;
private final Collection<String> names;
private final boolean ignoreSingleTables;
public DropResourceStatement(final Collection<String> names, final boolean ignoreSingleTables) {
- this.containsExistClause = false;
+ this.ifExist = false;
this.names = names;
this.ignoreSingleTables = ignoreSingleTables;
}
diff --git a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
index 3a009a4f968..f808779c652 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
+++ b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/rdl/drop/DropRuleStatement.java
@@ -24,13 +24,13 @@ import org.apache.shardingsphere.distsql.parser.statement.rdl.RuleDefinitionStat
/**
* Drop rule statement.
*/
-@Getter
@RequiredArgsConstructor
+@Getter
public abstract class DropRuleStatement extends RuleDefinitionStatement {
- private final boolean containsExistClause;
+ private final boolean ifExist;
public DropRuleStatement() {
- this.containsExistClause = false;
+ this(false);
}
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdater.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabase [...]
index ba832f0b19b..a7833fe84bb 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdater.java
@@ -46,7 +46,7 @@ public final class DropDatabaseDiscoveryHeartbeatStatementUpdater implements Rul
private void checkCurrentRuleConfiguration(final String databaseName,
final DropDatabaseDiscoveryHeartbeatStatement sqlStatement, final DatabaseDiscoveryRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
DistSQLException.predictionThrow(null != currentRuleConfig, () -> new RequiredRuleMissedException(RULE_TYPE, databaseName));
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdater.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDisco [...]
index e9fb1d700c9..3a5ccdc94ea 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryRuleStatementUpdater.java
@@ -54,7 +54,7 @@ public final class DropDatabaseDiscoveryRuleStatementUpdater implements RuleDefi
private void checkCurrentRuleConfiguration(final String databaseName, final DropDatabaseDiscoveryRuleStatement sqlStatement,
final DatabaseDiscoveryRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
DistSQLException.predictionThrow(null != currentRuleConfig, () -> new RequiredRuleMissedException(RULE_TYPE, databaseName));
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdater.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDisco [...]
index 4532a9df566..8691545eafe 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryTypeStatementUpdater.java
@@ -46,7 +46,7 @@ public final class DropDatabaseDiscoveryTypeStatementUpdater implements RuleDefi
private void checkCurrentRuleConfiguration(final String databaseName, final DropDatabaseDiscoveryTypeStatement sqlStatement,
final DatabaseDiscoveryRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
DistSQLException.predictionThrow(null != currentRuleConfig, () -> new RequiredRuleMissedException(RULE_TYPE, databaseName));
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropData [...]
index 6e810b0f6a3..654110e5d91 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryHeartbeatStatementUpdaterTest.java
@@ -84,7 +84,7 @@ public final class DropDatabaseDiscoveryHeartbeatStatementUpdaterTest {
}
private DropDatabaseDiscoveryHeartbeatStatement createSQLStatement() {
- return new DropDatabaseDiscoveryHeartbeatStatement(Collections.singleton("heartbeat_name"));
+ return new DropDatabaseDiscoveryHeartbeatStatement(Collections.singleton("heartbeat_name"), false);
}
private DropDatabaseDiscoveryHeartbeatStatement createSQLStatementWithIfExists() {
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderAlgorithmStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/ [...]
index 9e457f3097a..3697d007de0 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderAlgorithmStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-handler/src/test/java/org/apache/shardingsphere/dbdiscovery/distsql/handler/update/DropDatabaseDiscoveryProviderAlgorithmStatementUpdaterTest.java
@@ -84,11 +84,11 @@ public final class DropDatabaseDiscoveryProviderAlgorithmStatementUpdaterTest {
}
private DropDatabaseDiscoveryTypeStatement createSQLStatement() {
- return new DropDatabaseDiscoveryTypeStatement(Collections.singleton("type_name"));
+ return new DropDatabaseDiscoveryTypeStatement(false, Collections.singleton("type_name"));
}
private DropDatabaseDiscoveryTypeStatement createSQLStatementWithIfExists() {
- return new DropDatabaseDiscoveryTypeStatement(Collections.singleton("type_name_0"), true);
+ return new DropDatabaseDiscoveryTypeStatement(true, Collections.singleton("type_name_0"));
}
private DatabaseDiscoveryRuleConfiguration createCurrentRuleConfiguration() {
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLSt [...]
index 73b9cb5a911..f710152258d 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-parser/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/core/DatabaseDiscoveryDistSQLStatementVisitor.java
@@ -179,7 +179,7 @@ public final class DatabaseDiscoveryDistSQLStatementVisitor extends DatabaseDisc
@Override
public ASTNode visitDropDatabaseDiscoveryType(final DropDatabaseDiscoveryTypeContext ctx) {
- return new DropDatabaseDiscoveryTypeStatement(ctx.discoveryTypeName().stream().map(this::getIdentifierValue).collect(Collectors.toList()), null != ctx.existClause());
+ return new DropDatabaseDiscoveryTypeStatement(null != ctx.existClause(), ctx.discoveryTypeName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
}
@Override
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryHeartbeatStatement.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabas [...]
index 9a27af3a0f7..b744aa575dd 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryHeartbeatStatement.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryHeartbeatStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.dbdiscovery.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -26,14 +25,13 @@ import java.util.Collection;
/**
* Drop database discovery heartbeat statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropDatabaseDiscoveryHeartbeatStatement extends DropRuleStatement {
private final Collection<String> heartbeatNames;
- public DropDatabaseDiscoveryHeartbeatStatement(final Collection<String> heartbeatNames, final boolean containsExistClause) {
- super(containsExistClause);
+ public DropDatabaseDiscoveryHeartbeatStatement(final Collection<String> heartbeatNames, final boolean ifExist) {
+ super(ifExist);
this.heartbeatNames = heartbeatNames;
}
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryRuleStatement.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDisc [...]
index 420b114e653..f10b299af19 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryRuleStatement.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryRuleStatement.java
@@ -32,8 +32,8 @@ public final class DropDatabaseDiscoveryRuleStatement extends DropRuleStatement
private final Collection<String> ruleNames;
- public DropDatabaseDiscoveryRuleStatement(final Collection<String> ruleNames, final boolean containsExistClause) {
- super(containsExistClause);
+ public DropDatabaseDiscoveryRuleStatement(final Collection<String> ruleNames, final boolean ifExist) {
+ super(ifExist);
this.ruleNames = ruleNames;
}
}
diff --git a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryTypeStatement.java b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDisc [...]
index da42c68b38d..e74066b01e5 100644
--- a/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryTypeStatement.java
+++ b/shardingsphere-features/shardingsphere-db-discovery/shardingsphere-db-discovery-distsql/shardingsphere-db-discovery-distsql-statement/src/main/java/org/apache/shardingsphere/dbdiscovery/distsql/parser/statement/DropDatabaseDiscoveryTypeStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.dbdiscovery.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -26,14 +25,13 @@ import java.util.Collection;
/**
* Drop database discovery type statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropDatabaseDiscoveryTypeStatement extends DropRuleStatement {
private final Collection<String> types;
- public DropDatabaseDiscoveryTypeStatement(final Collection<String> types, final boolean containsExistClause) {
- super(containsExistClause);
+ public DropDatabaseDiscoveryTypeStatement(final boolean ifExist, final Collection<String> types) {
+ super(ifExist);
this.types = types;
}
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java
index 79438ab11c2..c67fbd2fd22 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java
@@ -41,7 +41,7 @@ public final class DropEncryptRuleStatementUpdater implements RuleDefinitionDrop
private void checkToBeDroppedEncryptTableNames(final String databaseName, final DropEncryptRuleStatement sqlStatement,
final EncryptRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
DistSQLException.predictionThrow(isExistRuleConfig(currentRuleConfig), () -> new RequiredRuleMissedException("Encrypt", databaseName));
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java
index 07f825525af..ab0590ce2d0 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java
@@ -86,7 +86,7 @@ public final class DropEncryptRuleStatementUpdaterTest {
}
private DropEncryptRuleStatement createSQLStatement(final String tableName) {
- return new DropEncryptRuleStatement(Collections.singleton(tableName));
+ return new DropEncryptRuleStatement(false, Collections.singleton(tableName));
}
private DropEncryptRuleStatement createSQLStatement(final boolean containsExistClause, final String tableName) {
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java
index 237a5ae8152..a4d5b93fa1d 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.encrypt.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -26,14 +25,13 @@ import java.util.Collection;
/**
* Drop encrypt rule statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropEncryptRuleStatement extends DropRuleStatement {
private final Collection<String> tables;
- public DropEncryptRuleStatement(final boolean containsExistClause, final Collection<String> tables) {
- super(containsExistClause);
+ public DropEncryptRuleStatement(final boolean ifExist, final Collection<String> tables) {
+ super(ifExist);
this.tables = tables;
}
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/re [...]
index eb1a5ac784c..f74f2c28bc3 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java
@@ -40,7 +40,7 @@ public final class DropReadwriteSplittingRuleStatementUpdater implements RuleDef
@Override
public void checkSQLStatement(final ShardingSphereDatabase database, final DropReadwriteSplittingRuleStatement sqlStatement,
final ReadwriteSplittingRuleConfiguration currentRuleConfig) throws RuleDefinitionViolationException {
- if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isContainsExistClause()) {
+ if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isIfExist()) {
return;
}
String databaseName = database.getName();
@@ -57,7 +57,7 @@ public final class DropReadwriteSplittingRuleStatementUpdater implements RuleDef
private void checkToBeDroppedRuleNames(final String databaseName, final DropReadwriteSplittingRuleStatement sqlStatement,
final ReadwriteSplittingRuleConfiguration currentRuleConfig) throws RequiredRuleMissedException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
Collection<String> currentRuleNames = currentRuleConfig.getDataSources().stream().map(ReadwriteSplittingDataSourceRuleConfiguration::getName).collect(Collectors.toList());
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingspher [...]
index 56a7c384b22..3a66eaeb2a9 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdaterTest.java
@@ -100,7 +100,7 @@ public final class DropReadwriteSplittingRuleStatementUpdaterTest {
}
private DropReadwriteSplittingRuleStatement createSQLStatement() {
- return new DropReadwriteSplittingRuleStatement(Collections.singleton("readwrite_ds"));
+ return new DropReadwriteSplittingRuleStatement(false, Collections.singleton("readwrite_ds"));
}
private ReadwriteSplittingRuleConfiguration createCurrentRuleConfiguration() {
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/rea [...]
index 5b46bb629fc..2940721120a 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.readwritesplitting.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -26,14 +25,13 @@ import java.util.Collection;
/**
* Drop readwrite splitting rule statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropReadwriteSplittingRuleStatement extends DropRuleStatement {
private final Collection<String> ruleNames;
- public DropReadwriteSplittingRuleStatement(final boolean containsExistClause, final Collection<String> ruleNames) {
- super(containsExistClause);
+ public DropReadwriteSplittingRuleStatement(final boolean ifExist, final Collection<String> ruleNames) {
+ super(ifExist);
this.ruleNames = ruleNames;
}
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngineTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngineTest.java
index e28cfc522b5..5eb8a1b9b97 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngineTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngineTest.java
@@ -55,7 +55,7 @@ public final class ShadowNonDMLStatementRoutingEngineTest {
private SQLStatementContext<?> createSQLStatementContext() {
CreateTableStatementContext result = mock(CreateTableStatementContext.class);
- MySQLCreateTableStatement sqlStatement = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement sqlStatement = new MySQLCreateTableStatement(false);
sqlStatement.getCommentSegments().add(new CommentSegment("/*shadow:true*/", 0, 20));
when(result.getSqlStatement()).thenReturn(sqlStatement);
return result;
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmStatementUpdater.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmStatementUpdater.java
index 77bf1a98815..b0570c958c4 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmStatementUpdater.java
@@ -38,7 +38,7 @@ public final class DropDefaultShadowAlgorithmStatementUpdater implements RuleDef
@Override
public void checkSQLStatement(final ShardingSphereDatabase database, final DropDefaultShadowAlgorithmStatement sqlStatement,
final ShadowRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause() && !isExistRuleConfig(currentRuleConfig)) {
+ if (sqlStatement.isIfExist() && !isExistRuleConfig(currentRuleConfig)) {
return;
}
checkConfigurationExist(database.getName(), currentRuleConfig);
@@ -50,7 +50,7 @@ public final class DropDefaultShadowAlgorithmStatementUpdater implements RuleDef
}
private void checkAlgorithm(final String databaseName, final DropDefaultShadowAlgorithmStatement sqlStatement, final ShadowRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (!sqlStatement.isContainsExistClause()) {
+ if (!sqlStatement.isIfExist()) {
DistSQLException.predictionThrow(null != currentRuleConfig.getDefaultShadowAlgorithmName(), () -> new RequiredAlgorithmMissedException(
SHADOW, databaseName, Collections.singleton("default")));
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java
index 9974f69f644..f18c32fc662 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java
@@ -45,7 +45,7 @@ public final class DropShadowAlgorithmStatementUpdater implements RuleDefinition
@Override
public void checkSQLStatement(final ShardingSphereDatabase database, final DropShadowAlgorithmStatement sqlStatement, final ShadowRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause() && !isExistRuleConfig(currentRuleConfig)) {
+ if (sqlStatement.isIfExist() && !isExistRuleConfig(currentRuleConfig)) {
return;
}
checkConfigurationExist(database.getName(), currentRuleConfig);
@@ -60,7 +60,7 @@ public final class DropShadowAlgorithmStatementUpdater implements RuleDefinition
Collection<String> currentAlgorithms = ShadowRuleStatementSupporter.getAlgorithmNames(currentRuleConfig);
Collection<String> requireAlgorithms = sqlStatement.getAlgorithmNames();
String defaultShadowAlgorithmName = currentRuleConfig.getDefaultShadowAlgorithmName();
- if (!sqlStatement.isContainsExistClause()) {
+ if (!sqlStatement.isIfExist()) {
ShadowRuleStatementChecker.checkAlgorithmExist(requireAlgorithms, currentAlgorithms, different -> new RequiredAlgorithmMissedException(SHADOW, databaseName, different));
}
checkAlgorithmInUsed(requireAlgorithms, getAlgorithmInUse(currentRuleConfig), identical -> new AlgorithmInUsedException(databaseName, identical));
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java
index 873aa819eb8..e20597a93b1 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java
@@ -37,7 +37,7 @@ public final class DropShadowRuleStatementUpdater implements RuleDefinitionDropU
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final DropShadowRuleStatement sqlStatement, final ShadowRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause() && !isExistRuleConfig(currentRuleConfig)) {
+ if (sqlStatement.isIfExist() && !isExistRuleConfig(currentRuleConfig)) {
return;
}
checkConfigurationExist(database.getName(), currentRuleConfig);
@@ -50,7 +50,7 @@ public final class DropShadowRuleStatementUpdater implements RuleDefinitionDropU
private void checkRuleNames(final String databaseName, final DropShadowRuleStatement sqlStatement, final ShadowRuleConfiguration currentRuleConfig) throws DistSQLException {
Collection<String> currentRuleNames = currentRuleConfig.getDataSources().keySet();
- if (!sqlStatement.isContainsExistClause()) {
+ if (!sqlStatement.isIfExist()) {
ShadowRuleStatementChecker.checkRulesExist(sqlStatement.getRuleNames(), currentRuleNames, different -> new RequiredRuleMissedException(SHADOW, databaseName, different));
}
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropDefaultShadowAlgorithmStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropDefaultShadowAlgorithmStatementUpdaterTest.java
index 0899caf7b7c..3d1a0cc377f 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropDefaultShadowAlgorithmStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropDefaultShadowAlgorithmStatementUpdaterTest.java
@@ -45,7 +45,7 @@ public final class DropDefaultShadowAlgorithmStatementUpdaterTest {
@Test(expected = RequiredAlgorithmMissedException.class)
public void assertCheckWithoutDefaultAlgorithm() throws DistSQLException {
- updater.checkSQLStatement(database, new DropDefaultShadowAlgorithmStatement(), currentConfig);
+ updater.checkSQLStatement(database, new DropDefaultShadowAlgorithmStatement(false), currentConfig);
}
@Test
@@ -58,7 +58,7 @@ public final class DropDefaultShadowAlgorithmStatementUpdaterTest {
public void assertUpdate() throws DistSQLException {
ShadowRuleConfiguration ruleConfig = new ShadowRuleConfiguration();
ruleConfig.setDefaultShadowAlgorithmName("default");
- DropDefaultShadowAlgorithmStatement statement = new DropDefaultShadowAlgorithmStatement();
+ DropDefaultShadowAlgorithmStatement statement = new DropDefaultShadowAlgorithmStatement(false);
updater.checkSQLStatement(database, new DropDefaultShadowAlgorithmStatement(true), ruleConfig);
assertTrue(updater.hasAnyOneToBeDropped(statement, ruleConfig));
updater.updateCurrentRuleConfiguration(statement, ruleConfig);
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java
index 53caaaacb4f..918e31ac11e 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java
@@ -67,10 +67,10 @@ public final class DropShadowAlgorithmStatementUpdaterTest {
}
private DropShadowAlgorithmStatement createSQLStatement(final String... ruleName) {
- return new DropShadowAlgorithmStatement(Arrays.asList(ruleName));
+ return new DropShadowAlgorithmStatement(false, Arrays.asList(ruleName));
}
- private DropShadowAlgorithmStatement createSQLStatement(final boolean containsExistClause, final String... ruleName) {
- return new DropShadowAlgorithmStatement(containsExistClause, Arrays.asList(ruleName));
+ private DropShadowAlgorithmStatement createSQLStatement(final boolean ifExist, final String... ruleName) {
+ return new DropShadowAlgorithmStatement(ifExist, Arrays.asList(ruleName));
}
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java
index 199fb271cb6..791e4d6755c 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java
@@ -82,10 +82,10 @@ public final class DropShadowRuleStatementUpdaterTest {
}
private DropShadowRuleStatement createSQLStatement(final String... ruleName) {
- return new DropShadowRuleStatement(Arrays.asList(ruleName));
+ return new DropShadowRuleStatement(false, Arrays.asList(ruleName));
}
- private DropShadowRuleStatement createSQLStatement(final boolean containsExistClause, final String... ruleName) {
- return new DropShadowRuleStatement(containsExistClause, Arrays.asList(ruleName));
+ private DropShadowRuleStatement createSQLStatement(final boolean ifExist, final String... ruleName) {
+ return new DropShadowRuleStatement(ifExist, Arrays.asList(ruleName));
}
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java
index 33767b46fc5..c74cdbac6df 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java
@@ -17,18 +17,14 @@
package org.apache.shardingsphere.shadow.distsql.parser.statement;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
/**
* Drop default shadow algorithm statement.
*/
-@RequiredArgsConstructor
-@Getter
public final class DropDefaultShadowAlgorithmStatement extends DropRuleStatement {
- public DropDefaultShadowAlgorithmStatement(final boolean containsExistClause) {
- super(containsExistClause);
+ public DropDefaultShadowAlgorithmStatement(final boolean ifExist) {
+ super(ifExist);
}
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java
index 6c939baeeb9..f7ada114012 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.shadow.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -26,14 +25,13 @@ import java.util.Collection;
/**
* Drop shadow algorithm statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropShadowAlgorithmStatement extends DropRuleStatement {
private final Collection<String> algorithmNames;
- public DropShadowAlgorithmStatement(final boolean containsExistClause, final Collection<String> algorithmNames) {
- super(containsExistClause);
+ public DropShadowAlgorithmStatement(final boolean ifExist, final Collection<String> algorithmNames) {
+ super(ifExist);
this.algorithmNames = algorithmNames;
}
}
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java
index dd36f3219cb..7886b7b2c85 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.shadow.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -26,14 +25,13 @@ import java.util.Collection;
/**
* Drop shadow rule statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropShadowRuleStatement extends DropRuleStatement {
private final Collection<String> ruleNames;
- public DropShadowRuleStatement(final boolean containsExistClause, final Collection<String> ruleNames) {
- super(containsExistClause);
+ public DropShadowRuleStatement(final boolean ifExist, final Collection<String> ruleNames) {
+ super(ifExist);
this.ruleNames = ruleNames;
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateFunctionStatementValidatorTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateFunctionStatementValidatorTest.java
index 17833af1cf5..68f90ad7686 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateFunctionStatementValidatorTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateFunctionStatementValidatorTest.java
@@ -56,7 +56,7 @@ public final class ShardingCreateFunctionStatementValidatorTest {
public void assertPreValidateCreateFunctionForMySQL() {
MySQLSelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order_item"))));
- MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement(false);
createTableStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
ValidStatementSegment validStatementSegment = new ValidStatementSegment(0, 0);
validStatementSegment.setSqlStatement(createTableStatement);
@@ -104,7 +104,7 @@ public final class ShardingCreateFunctionStatementValidatorTest {
@Test(expected = TableExistsException.class)
public void assertPreValidateCreateFunctionWithTableExistsForMySQL() {
- MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement(false);
createTableStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
ValidStatementSegment validStatementSegment = new ValidStatementSegment(0, 0);
validStatementSegment.setSqlStatement(createTableStatement);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateProcedureStatementValidatorTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateProcedureStatementValidatorTest.java
index b560a7f4de5..a66d5b6be8d 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateProcedureStatementValidatorTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateProcedureStatementValidatorTest.java
@@ -56,7 +56,7 @@ public final class ShardingCreateProcedureStatementValidatorTest {
public void assertPreValidateCreateProcedureForMySQL() {
MySQLSelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order_item"))));
- MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement(false);
createTableStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
ValidStatementSegment validStatementSegment = new ValidStatementSegment(0, 0);
validStatementSegment.setSqlStatement(createTableStatement);
@@ -105,7 +105,7 @@ public final class ShardingCreateProcedureStatementValidatorTest {
@Test(expected = TableExistsException.class)
public void assertPreValidateCreateProcedureWithTableExistsForMySQL() {
- MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement(false);
createTableStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
ValidStatementSegment validStatementSegment = new ValidStatementSegment(0, 0);
validStatementSegment.setSqlStatement(createTableStatement);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateTableStatementValidatorTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateTableStatementValidatorTest.java
index b09690fdbe2..298561de928 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateTableStatementValidatorTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateTableStatementValidatorTest.java
@@ -67,9 +67,8 @@ public final class ShardingCreateTableStatementValidatorTest {
@Test(expected = TableExistsException.class)
public void assertPreValidateCreateTableForMySQL() {
- MySQLCreateTableStatement sqlStatement = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement sqlStatement = new MySQLCreateTableStatement(false);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(1, 2, new IdentifierValue("t_order"))));
- sqlStatement.setContainsNotExistClause(false);
assertPreValidateCreateTable(sqlStatement, "sharding_db");
}
@@ -82,9 +81,8 @@ public final class ShardingCreateTableStatementValidatorTest {
@Test(expected = TableExistsException.class)
public void assertPreValidateCreateTableForPostgreSQL() {
- PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement();
+ PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement(false);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(1, 2, new IdentifierValue("t_order"))));
- sqlStatement.setContainsNotExistClause(false);
assertPreValidateCreateTable(sqlStatement, "public");
}
@@ -112,17 +110,15 @@ public final class ShardingCreateTableStatementValidatorTest {
@Test
public void assertPreValidateCreateTableIfNotExistsForMySQL() {
- MySQLCreateTableStatement sqlStatement = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement sqlStatement = new MySQLCreateTableStatement(true);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(1, 2, new IdentifierValue("t_order"))));
- sqlStatement.setContainsNotExistClause(true);
assertPreValidateCreateTableIfNotExists(sqlStatement);
}
@Test
public void assertPreValidateCreateTableIfNotExistsForPostgreSQL() {
- PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement();
+ PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement(true);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(1, 2, new IdentifierValue("t_order"))));
- sqlStatement.setContainsNotExistClause(true);
assertPreValidateCreateTableIfNotExists(sqlStatement);
}
@@ -134,7 +130,7 @@ public final class ShardingCreateTableStatementValidatorTest {
@Test
public void assertPostValidateCreateTableWithSameRouteResultShardingTableForPostgreSQL() {
- PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement();
+ PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement(false);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
when(shardingRule.isShardingTable("t_order")).thenReturn(true);
when(shardingRule.getTableRule("t_order")).thenReturn(new TableRule(Arrays.asList("ds_0", "ds_1"), "t_order"));
@@ -148,7 +144,7 @@ public final class ShardingCreateTableStatementValidatorTest {
@Test(expected = ShardingSphereException.class)
public void assertPostValidateCreateTableWithDifferentRouteResultShardingTableForPostgreSQL() {
- PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement();
+ PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement(false);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
when(shardingRule.isShardingTable("t_order")).thenReturn(true);
when(shardingRule.getTableRule("t_order")).thenReturn(new TableRule(Arrays.asList("ds_0", "ds_1"), "t_order"));
@@ -161,7 +157,7 @@ public final class ShardingCreateTableStatementValidatorTest {
@Test
public void assertPostValidateCreateTableWithSameRouteResultBroadcastTableForPostgreSQL() {
- PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement();
+ PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement(false);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_config"))));
when(shardingRule.isBroadcastTable("t_config")).thenReturn(true);
when(shardingRule.getTableRule("t_config")).thenReturn(new TableRule(Arrays.asList("ds_0", "ds_1"), "t_config"));
@@ -175,7 +171,7 @@ public final class ShardingCreateTableStatementValidatorTest {
@Test(expected = ShardingSphereException.class)
public void assertPostValidateCreateTableWithDifferentRouteResultBroadcastTableForPostgreSQL() {
- PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement();
+ PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement(false);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_config"))));
when(shardingRule.isBroadcastTable("t_config")).thenReturn(true);
when(shardingRule.getTableRule("t_config")).thenReturn(new TableRule(Arrays.asList("ds_0", "ds_1"), "t_config"));
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingDropIndexStatementValidatorTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingDropIndexStatementValidatorTest.java
index d97f7cba598..c458105639f 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingDropIndexStatementValidatorTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingDropIndexStatementValidatorTest.java
@@ -63,7 +63,7 @@ public final class ShardingDropIndexStatementValidatorTest {
@Test
public void assertPreValidateDropIndexWhenIndexExistForPostgreSQL() {
- PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement();
+ PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement(false);
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_order_index"))));
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_order_index_new"))));
ShardingSphereTable table = mock(ShardingSphereTable.class);
@@ -78,7 +78,7 @@ public final class ShardingDropIndexStatementValidatorTest {
@Test(expected = ShardingSphereException.class)
public void assertPreValidateDropIndexWhenIndexNotExistForPostgreSQL() {
- PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement();
+ PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement(false);
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_order_index"))));
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_order_index_new"))));
ShardingSphereTable table = mock(ShardingSphereTable.class);
@@ -92,7 +92,7 @@ public final class ShardingDropIndexStatementValidatorTest {
@Test
public void assertPostValidateDropIndexWithSameRouteResultShardingTableIndexForPostgreSQL() {
- PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement();
+ PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement(false);
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_order_index"))));
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_order_index_new"))));
ShardingSphereTable table = mock(ShardingSphereTable.class);
@@ -113,7 +113,7 @@ public final class ShardingDropIndexStatementValidatorTest {
@Test(expected = ShardingSphereException.class)
public void assertPostValidateDropIndexWithDifferentRouteResultShardingTableIndexForPostgreSQL() {
- PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement();
+ PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement(false);
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_order_index"))));
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_order_index_new"))));
ShardingSphereTable table = mock(ShardingSphereTable.class);
@@ -133,7 +133,7 @@ public final class ShardingDropIndexStatementValidatorTest {
@Test
public void assertPostValidateDropIndexWithSameRouteResultBroadcastTableIndexForPostgreSQL() {
- PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement();
+ PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement(false);
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_config_index"))));
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_config_index_new"))));
ShardingSphereTable table = mock(ShardingSphereTable.class);
@@ -154,7 +154,7 @@ public final class ShardingDropIndexStatementValidatorTest {
@Test(expected = ShardingSphereException.class)
public void assertPostValidateDropIndexWithDifferentRouteResultBroadcastTableIndexForPostgreSQL() {
- PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement();
+ PostgreSQLDropIndexStatement sqlStatement = new PostgreSQLDropIndexStatement(false);
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_config_index"))));
sqlStatement.getIndexes().add(new IndexSegment(0, 0, new IndexNameSegment(0, 0, new IdentifierValue("t_config_index_new"))));
ShardingSphereTable table = mock(ShardingSphereTable.class);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingDropTableStatementValidatorTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingDropTableStatementValidatorTest.java
index 553c2efbd86..8463164b47b 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingDropTableStatementValidatorTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingDropTableStatementValidatorTest.java
@@ -74,7 +74,7 @@ public final class ShardingDropTableStatementValidatorTest {
@Test(expected = ShardingSphereException.class)
public void assertPreValidateDropTableForMySQL() {
- MySQLDropTableStatement sqlStatement = new MySQLDropTableStatement();
+ MySQLDropTableStatement sqlStatement = new MySQLDropTableStatement(false);
sqlStatement.getTables().add(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order_item"))));
SQLStatementContext<DropTableStatement> sqlStatementContext = new CommonSQLStatementContext<>(sqlStatement);
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
@@ -113,7 +113,7 @@ public final class ShardingDropTableStatementValidatorTest {
@Test
public void assertPostValidateDropTableWithSameRouteResultShardingTableForPostgreSQL() {
- PostgreSQLDropTableStatement sqlStatement = new PostgreSQLDropTableStatement();
+ PostgreSQLDropTableStatement sqlStatement = new PostgreSQLDropTableStatement(false);
sqlStatement.getTables().add(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
when(shardingRule.isShardingTable("t_order")).thenReturn(true);
when(shardingRule.getTableRule("t_order")).thenReturn(new TableRule(Arrays.asList("ds_0", "ds_1"), "t_order"));
@@ -127,7 +127,7 @@ public final class ShardingDropTableStatementValidatorTest {
@Test(expected = ShardingSphereException.class)
public void assertPostValidateDropTableWithDifferentRouteResultShardingTableForPostgreSQL() {
- PostgreSQLDropTableStatement sqlStatement = new PostgreSQLDropTableStatement();
+ PostgreSQLDropTableStatement sqlStatement = new PostgreSQLDropTableStatement(false);
sqlStatement.getTables().add(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
when(shardingRule.isShardingTable("t_order")).thenReturn(true);
when(shardingRule.getTableRule("t_order")).thenReturn(new TableRule(Arrays.asList("ds_0", "ds_1"), "t_order"));
@@ -140,7 +140,7 @@ public final class ShardingDropTableStatementValidatorTest {
@Test
public void assertPostValidateDropTableWithSameRouteResultBroadcastTableForPostgreSQL() {
- PostgreSQLDropTableStatement sqlStatement = new PostgreSQLDropTableStatement();
+ PostgreSQLDropTableStatement sqlStatement = new PostgreSQLDropTableStatement(false);
sqlStatement.getTables().add(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_config"))));
when(shardingRule.isBroadcastTable("t_config")).thenReturn(true);
when(shardingRule.getTableRule("t_config")).thenReturn(new TableRule(Arrays.asList("ds_0", "ds_1"), "t_config"));
@@ -154,7 +154,7 @@ public final class ShardingDropTableStatementValidatorTest {
@Test(expected = ShardingSphereException.class)
public void assertPostValidateDropTableWithDifferentRouteResultBroadcastTableForPostgreSQL() {
- PostgreSQLDropTableStatement sqlStatement = new PostgreSQLDropTableStatement();
+ PostgreSQLDropTableStatement sqlStatement = new PostgreSQLDropTableStatement(false);
sqlStatement.getTables().add(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_config"))));
when(shardingRule.isBroadcastTable("t_config")).thenReturn(true);
when(shardingRule.getTableRule("t_config")).thenReturn(new TableRule(Arrays.asList("ds_0", "ds_1"), "t_config"));
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/update/DropShardingScalingRuleStatementUpdater.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/update/DropShardingScalingRuleStatementUpdater.java
index 0665a3ce992..8cb526232ff 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/update/DropShardingScalingRuleStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/update/DropShardingScalingRuleStatementUpdater.java
@@ -32,7 +32,7 @@ public final class DropShardingScalingRuleStatementUpdater implements RuleDefini
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final DropShardingScalingRuleStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isContainsExistClause()) {
+ if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isIfExist()) {
return;
}
String databaseName = database.getName();
@@ -52,7 +52,7 @@ public final class DropShardingScalingRuleStatementUpdater implements RuleDefini
}
private void checkExist(final String databaseName, final DropShardingScalingRuleStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
if (!currentRuleConfig.getScaling().containsKey(sqlStatement.getScalingName())) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
index 74128253668..f05f2f0cfde 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultStrategyStatementUpdater.java
@@ -36,7 +36,7 @@ public final class DropDefaultStrategyStatementUpdater implements RuleDefinition
@Override
public void checkSQLStatement(final ShardingSphereDatabase database, final DropDefaultShardingStrategyStatement sqlStatement,
final ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isContainsExistClause()) {
+ if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isIfExist()) {
return;
}
String databaseName = database.getName();
@@ -45,7 +45,7 @@ public final class DropDefaultStrategyStatementUpdater implements RuleDefinition
}
private void checkExist(final String databaseName, final DropDefaultShardingStrategyStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
Optional<ShardingStrategyConfiguration> strategyConfig = getStrategyConfiguration(currentRuleConfig, sqlStatement.getDefaultType());
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
index e65f446659c..98b4e869f25 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java
@@ -39,7 +39,7 @@ public final class DropShardingAlgorithmStatementUpdater implements RuleDefiniti
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final DropShardingAlgorithmStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws RuleDefinitionViolationException {
- if (null == currentRuleConfig && sqlStatement.isContainsExistClause()) {
+ if (null == currentRuleConfig && sqlStatement.isIfExist()) {
return;
}
String databaseName = database.getName();
@@ -56,7 +56,7 @@ public final class DropShardingAlgorithmStatementUpdater implements RuleDefiniti
private void checkToBeDroppedShardingAlgorithms(final String databaseName, final DropShardingAlgorithmStatement sqlStatement,
final ShardingRuleConfiguration currentRuleConfig) throws RequiredAlgorithmMissedException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
Collection<String> currentShardingAlgorithms = getCurrentShardingAlgorithms(currentRuleConfig);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBindingTableRuleStatementUpdater.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBindingTableRuleStatementUpdater.java
index ab1ae26a6c4..0adf3e062d2 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBindingTableRuleStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBindingTableRuleStatementUpdater.java
@@ -48,7 +48,7 @@ public final class DropShardingBindingTableRuleStatementUpdater implements RuleD
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final DropShardingBindingTableRulesStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isContainsExistClause()) {
+ if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isIfExist()) {
return;
}
String databaseName = database.getName();
@@ -69,7 +69,7 @@ public final class DropShardingBindingTableRuleStatementUpdater implements RuleD
private void checkBindingTableRuleExist(final String databaseName, final DropShardingBindingTableRulesStatement sqlStatement,
final Map<String, String> bindingRelationship) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
Collection<String> notExistBindingGroups = new LinkedList<>();
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBroadcastTableRuleStatementUpdater.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBroadcastTableRuleStatementUpd [...]
index 50a17c84781..51a49705d2c 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBroadcastTableRuleStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingBroadcastTableRuleStatementUpdater.java
@@ -36,7 +36,7 @@ public final class DropShardingBroadcastTableRuleStatementUpdater implements Rul
public void checkSQLStatement(final ShardingSphereDatabase database,
final DropShardingBroadcastTableRulesStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
String databaseName = database.getName();
- if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isContainsExistClause()) {
+ if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isIfExist()) {
return;
}
checkCurrentRuleConfiguration(databaseName, currentRuleConfig);
@@ -45,7 +45,7 @@ public final class DropShardingBroadcastTableRuleStatementUpdater implements Rul
private void checkBroadcastTableRuleExist(final String databaseName,
final DropShardingBroadcastTableRulesStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
if (!sqlStatement.getRules().isEmpty()) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
index b1f17152e1f..581a272b7fa 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java
@@ -41,7 +41,7 @@ public final class DropShardingKeyGeneratorStatementUpdater implements RuleDefin
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final DropShardingKeyGeneratorStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (null == currentRuleConfig && sqlStatement.isContainsExistClause()) {
+ if (null == currentRuleConfig && sqlStatement.isIfExist()) {
return;
}
String databaseName = database.getName();
@@ -52,7 +52,7 @@ public final class DropShardingKeyGeneratorStatementUpdater implements RuleDefin
private void checkExist(final String databaseName, final Collection<String> keyGeneratorNames, final ShardingRuleConfiguration currentRuleConfig,
final DropShardingKeyGeneratorStatement sqlStatement) throws DistSQLException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
Collection<String> notExistKeyGenerators = keyGeneratorNames.stream().filter(each -> !currentRuleConfig.getKeyGenerators().containsKey(each)).collect(Collectors.toList());
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
index 2b93efc5f13..dcc34ca90d6 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java
@@ -44,7 +44,7 @@ public final class DropShardingTableRuleStatementUpdater implements RuleDefiniti
@Override
public void checkSQLStatement(final ShardingSphereDatabase database,
final DropShardingTableRuleStatement sqlStatement, final ShardingRuleConfiguration currentRuleConfig) throws RuleDefinitionViolationException {
- if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isContainsExistClause()) {
+ if (!isExistRuleConfig(currentRuleConfig) && sqlStatement.isIfExist()) {
return;
}
String databaseName = database.getName();
@@ -65,7 +65,7 @@ public final class DropShardingTableRuleStatementUpdater implements RuleDefiniti
private void checkToBeDroppedShardingTableNames(final String databaseName, final DropShardingTableRuleStatement sqlStatement,
final ShardingRuleConfiguration currentRuleConfig) throws RequiredRuleMissedException {
- if (sqlStatement.isContainsExistClause()) {
+ if (sqlStatement.isIfExist()) {
return;
}
Collection<String> currentShardingTableNames = getCurrentShardingTableNames(currentRuleConfig);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/update/DropShardingScalingRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/update/DropShardingScalingRuleStatementUpdaterTest.java
index 161acabbfbd..71678572371 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/update/DropShardingScalingRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/update/DropShardingScalingRuleStatementUpdaterTest.java
@@ -80,6 +80,6 @@ public final class DropShardingScalingRuleStatementUpdaterTest {
}
private DropShardingScalingRuleStatement createSQLStatement(final String scalingName) {
- return new DropShardingScalingRuleStatement(scalingName);
+ return new DropShardingScalingRuleStatement(false, scalingName);
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java
index e78cfa58b1b..753cf551587 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java
@@ -42,7 +42,7 @@ public final class DropDefaultShardingStrategyStatementUpdaterTest {
@Test(expected = RequiredRuleMissedException.class)
public void assertCheckSQLStatementWithoutCurrentRule() throws DistSQLException {
- updater.checkSQLStatement(database, new DropDefaultShardingStrategyStatement("TABLE"), null);
+ updater.checkSQLStatement(database, new DropDefaultShardingStrategyStatement(false, "TABLE"), null);
}
@Test(expected = RequiredRuleMissedException.class)
@@ -64,7 +64,7 @@ public final class DropDefaultShardingStrategyStatementUpdaterTest {
}
private DropDefaultShardingStrategyStatement createSQLStatement(final String defaultType) {
- return new DropDefaultShardingStrategyStatement(defaultType);
+ return new DropDefaultShardingStrategyStatement(false, defaultType);
}
private ShardingRuleConfiguration createCurrentRuleConfiguration() {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java
index f3e883569ff..ab7469fcce3 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java
@@ -51,7 +51,7 @@ public final class DropShardingAlgorithmStatementUpdaterTest {
@Test(expected = RequiredAlgorithmMissedException.class)
public void assertCheckSQLStatementWithoutCurrentRule() throws RuleDefinitionViolationException {
- updater.checkSQLStatement(database, new DropShardingAlgorithmStatement(Collections.emptyList()), null);
+ updater.checkSQLStatement(database, new DropShardingAlgorithmStatement(false, Collections.emptyList()), null);
}
@Test
@@ -105,7 +105,7 @@ public final class DropShardingAlgorithmStatementUpdaterTest {
}
private DropShardingAlgorithmStatement createSQLStatement(final String algorithmName) {
- return new DropShardingAlgorithmStatement(Collections.singleton(algorithmName));
+ return new DropShardingAlgorithmStatement(false, Collections.singleton(algorithmName));
}
private DropShardingAlgorithmStatement createSQLStatementWithIfExists(final String algorithmName) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingBindingTableRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingBindingTableRuleStatementUpdaterTest.java
index 806b65752fa..7ab9919ea3b 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingBindingTableRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingBindingTableRuleStatementUpdaterTest.java
@@ -126,12 +126,12 @@ public final class DropShardingBindingTableRuleStatementUpdaterTest {
private DropShardingBindingTableRulesStatement createSQLStatement(final String... group) {
Collection<BindingTableRuleSegment> segments = Arrays.stream(group).map(BindingTableRuleSegment::new).collect(Collectors.toList());
- return new DropShardingBindingTableRulesStatement(segments);
+ return new DropShardingBindingTableRulesStatement(false, segments);
}
- private DropShardingBindingTableRulesStatement createSQLStatement(final boolean containsExistClause, final String... group) {
+ private DropShardingBindingTableRulesStatement createSQLStatement(final boolean ifExist, final String... group) {
Collection<BindingTableRuleSegment> segments = Arrays.stream(group).map(BindingTableRuleSegment::new).collect(Collectors.toList());
- return new DropShardingBindingTableRulesStatement(containsExistClause, segments);
+ return new DropShardingBindingTableRulesStatement(ifExist, segments);
}
private ShardingRuleConfiguration createCurrentRuleConfiguration() {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingBroadcastTableRuleStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingBroadcastTableRuleStatementUpdaterTest.java
index 6000bcb2efd..7a9e9ec52b0 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingBroadcastTableRuleStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingBroadcastTableRuleStatementUpdaterTest.java
@@ -94,12 +94,12 @@ public final class DropShardingBroadcastTableRuleStatementUpdaterTest {
}
private DropShardingBroadcastTableRulesStatement createSQLStatement(final String tableName) {
- return null == tableName ? new DropShardingBroadcastTableRulesStatement(Collections.emptyList())
- : new DropShardingBroadcastTableRulesStatement(Collections.singleton(tableName));
+ return null == tableName ? new DropShardingBroadcastTableRulesStatement(false, Collections.emptyList())
+ : new DropShardingBroadcastTableRulesStatement(false, Collections.singleton(tableName));
}
private DropShardingBroadcastTableRulesStatement createSQLStatement(final boolean containsExistClause, final String tableName) {
- return null == tableName ? new DropShardingBroadcastTableRulesStatement(Collections.emptyList())
+ return null == tableName ? new DropShardingBroadcastTableRulesStatement(false, Collections.emptyList())
: new DropShardingBroadcastTableRulesStatement(containsExistClause, Collections.singleton(tableName));
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
index 62cc49d7455..0c1a4939533 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
@@ -88,6 +88,6 @@ public final class DropShardingKeyGeneratorStatementUpdaterTest {
}
private DropShardingKeyGeneratorStatement createSQLStatement(final String... keyGeneratorNames) {
- return new DropShardingKeyGeneratorStatement(Arrays.asList(keyGeneratorNames));
+ return new DropShardingKeyGeneratorStatement(false, Arrays.asList(keyGeneratorNames));
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
index 25311f35342..4ce4cb095d9 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
@@ -275,9 +275,7 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitDropShardingAlgorithm(final DropShardingAlgorithmContext ctx) {
- DropShardingAlgorithmStatement result = new DropShardingAlgorithmStatement(null != ctx.existsClause(),
- ctx.algorithmName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
- return result;
+ return new DropShardingAlgorithmStatement(null != ctx.existsClause(), ctx.algorithmName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
}
@Override
@@ -449,9 +447,7 @@ public final class ShardingDistSQLStatementVisitor extends ShardingDistSQLStatem
@Override
public ASTNode visitDropShardingKeyGenerator(final DropShardingKeyGeneratorContext ctx) {
- DropShardingKeyGeneratorStatement result = new DropShardingKeyGeneratorStatement(null != ctx.existsClause(),
- ctx.keyGeneratorName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
- return result;
+ return new DropShardingKeyGeneratorStatement(null != ctx.existsClause(), ctx.keyGeneratorName().stream().map(this::getIdentifierValue).collect(Collectors.toList()));
}
@Override
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/scaling/distsql/statement/DropShardingScalingRuleStatement.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/scaling/distsql/statement/DropShardingScalingRuleStatement.java
index 63fadfb3152..315a17490ea 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/scaling/distsql/statement/DropShardingScalingRuleStatement.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/scaling/distsql/statement/DropShardingScalingRuleStatement.java
@@ -18,20 +18,18 @@
package org.apache.shardingsphere.scaling.distsql.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
/**
* Drop sharding scaling rule statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropShardingScalingRuleStatement extends DropRuleStatement {
private final String scalingName;
- public DropShardingScalingRuleStatement(final boolean containsExistClause, final String scalingName) {
- super(containsExistClause);
+ public DropShardingScalingRuleStatement(final boolean ifExist, final String scalingName) {
+ super(ifExist);
this.scalingName = scalingName;
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java
index 37a834935f7..00aee9658db 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java
@@ -18,20 +18,18 @@
package org.apache.shardingsphere.sharding.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
/**
* Drop default sharding strategy statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropDefaultShardingStrategyStatement extends DropRuleStatement {
private final String defaultType;
- public DropDefaultShardingStrategyStatement(final boolean containsExistClause, final String defaultType) {
- super(containsExistClause);
+ public DropDefaultShardingStrategyStatement(final boolean ifExist, final String defaultType) {
+ super(ifExist);
this.defaultType = defaultType;
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java
index a0b1e1efaba..abd4a9001d3 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.sharding.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -26,14 +25,13 @@ import java.util.Collection;
/**
* Drop sharding algorithm statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropShardingAlgorithmStatement extends DropRuleStatement {
private final Collection<String> algorithmNames;
- public DropShardingAlgorithmStatement(final boolean containsExistClause, final Collection<String> algorithmNames) {
- super(containsExistClause);
+ public DropShardingAlgorithmStatement(final boolean ifExist, final Collection<String> algorithmNames) {
+ super(ifExist);
this.algorithmNames = algorithmNames;
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBindingTableRulesStatement.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBindingTableRulesStatement.java
index b0f8e4957de..a856e266fd8 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBindingTableRulesStatement.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBindingTableRulesStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.sharding.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import org.apache.shardingsphere.sharding.distsql.parser.segment.BindingTableRuleSegment;
@@ -28,14 +27,13 @@ import java.util.LinkedList;
/**
* Drop sharding binding table rules statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropShardingBindingTableRulesStatement extends DropRuleStatement {
private final Collection<BindingTableRuleSegment> rules;
- public DropShardingBindingTableRulesStatement(final boolean containsExistClause, final Collection<BindingTableRuleSegment> rules) {
- super(containsExistClause);
+ public DropShardingBindingTableRulesStatement(final boolean ifExist, final Collection<BindingTableRuleSegment> rules) {
+ super(ifExist);
this.rules = rules;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBroadcastTableRulesStatement.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBroadcastTableRulesStatement.java
index 60bc5a1904e..74228ae7024 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBroadcastTableRulesStatement.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingBroadcastTableRulesStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.sharding.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -27,13 +26,12 @@ import java.util.Collection;
* Drop sharding broadcast table rules statement.
*/
@Getter
-@RequiredArgsConstructor
public final class DropShardingBroadcastTableRulesStatement extends DropRuleStatement {
private final Collection<String> rules;
- public DropShardingBroadcastTableRulesStatement(final boolean containsExistClause, final Collection<String> rules) {
- super(containsExistClause);
+ public DropShardingBroadcastTableRulesStatement(final boolean ifExist, final Collection<String> rules) {
+ super(ifExist);
this.rules = rules;
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java
index e66287a98f0..fde2a79c27d 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.sharding.distsql.parser.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement;
import java.util.Collection;
@@ -26,14 +25,13 @@ import java.util.Collection;
/**
* Drop sharding key generator statement.
*/
-@RequiredArgsConstructor
@Getter
public final class DropShardingKeyGeneratorStatement extends DropRuleStatement {
private final Collection<String> keyGeneratorNames;
- public DropShardingKeyGeneratorStatement(final boolean containsExistClause, final Collection<String> keyGeneratorNames) {
- super(containsExistClause);
+ public DropShardingKeyGeneratorStatement(final boolean ifExist, final Collection<String> keyGeneratorNames) {
+ super(ifExist);
this.keyGeneratorNames = keyGeneratorNames;
}
}
diff --git a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouterTest.java b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouterTest.java
index 99a17281b55..82be65921ae 100644
--- a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouterTest.java
+++ b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/SingleTableSQLRouterTest.java
@@ -147,7 +147,7 @@ public final class SingleTableSQLRouterTest {
}
private LogicSQL createLogicSQL() {
- CreateTableStatement createTableStatement = new MySQLCreateTableStatement();
+ CreateTableStatement createTableStatement = new MySQLCreateTableStatement(false);
createTableStatement.setTable(new SimpleTableSegment(new TableNameSegment(1, 2, new IdentifierValue("t_order"))));
return new LogicSQL(new CreateTableStatementContext(createTableStatement), "CREATE TABLE", new LinkedList<>());
}
diff --git a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableStandardRouteEngineTest.java b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableStandardRouteEngineTest.java
index 7824aba0242..f5a827910e2 100644
--- a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableStandardRouteEngineTest.java
+++ b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/test/java/org/apache/shardingsphere/singletable/route/engine/SingleTableStandardRouteEngineTest.java
@@ -112,7 +112,7 @@ public final class SingleTableStandardRouteEngineTest {
@Test
public void assertRouteWithoutSingleTableRule() throws SQLException {
- SingleTableStandardRouteEngine engine = new SingleTableStandardRouteEngine(mockQualifiedTables(), new MySQLCreateTableStatement());
+ SingleTableStandardRouteEngine engine = new SingleTableStandardRouteEngine(mockQualifiedTables(), new MySQLCreateTableStatement(false));
SingleTableRule singleTableRule = new SingleTableRule(
new SingleTableRuleConfiguration(), DefaultDatabase.LOGIC_NAME, createDataSourceMap(), Collections.emptyList(), new ConfigurationProperties(new Properties()));
RouteContext routeContext = new RouteContext();
@@ -128,7 +128,7 @@ public final class SingleTableStandardRouteEngineTest {
@Test
public void assertRouteWithDefaultSingleTableRule() throws SQLException {
- SingleTableStandardRouteEngine engine = new SingleTableStandardRouteEngine(mockQualifiedTables(), new MySQLCreateTableStatement());
+ SingleTableStandardRouteEngine engine = new SingleTableStandardRouteEngine(mockQualifiedTables(), new MySQLCreateTableStatement(false));
SingleTableRule singleTableRule = new SingleTableRule(
new SingleTableRuleConfiguration("ds_0"), DefaultDatabase.LOGIC_NAME, createDataSourceMap(), Collections.emptyList(), new ConfigurationProperties(new Properties()));
RouteContext routeContext = new RouteContext();
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandler.java
index 54727b59bba..212cf5fbcc0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandler.java
@@ -43,7 +43,7 @@ public final class CreateDatabaseBackendHandler implements TextProtocolBackendHa
}
private void check(final CreateDatabaseStatement sqlStatement) {
- if (!sqlStatement.isContainsNotExistClause() && ProxyContext.getInstance().getAllDatabaseNames().contains(sqlStatement.getDatabaseName())) {
+ if (!sqlStatement.isIfNotExist() && ProxyContext.getInstance().getAllDatabaseNames().contains(sqlStatement.getDatabaseName())) {
throw new DBCreateExistsException(sqlStatement.getDatabaseName());
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
index fda2ea1b7aa..b17aa8c0898 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandler.java
@@ -60,7 +60,7 @@ public final class DropDatabaseBackendHandler implements TextProtocolBackendHand
if (!SQLCheckEngine.check(databaseName, getRules(databaseName), grantee)) {
throw new UnknownDatabaseException(databaseName);
}
- if (!sqlStatement.isContainsExistClause() && !ProxyContext.getInstance().getAllDatabaseNames().contains(databaseName)) {
+ if (!sqlStatement.isIfExist() && !ProxyContext.getInstance().getAllDatabaseNames().contains(databaseName)) {
throw new DBDropNotExistsException(databaseName);
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
index e799206e369..e871c03b0c1 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/resource/DropResourceBackendHandler.java
@@ -52,7 +52,7 @@ public final class DropResourceBackendHandler extends DatabaseRequiredBackendHan
@Override
public ResponseHeader execute(final String databaseName, final DropResourceStatement sqlStatement) throws DistSQLException {
Collection<String> toBeDroppedResourceNames = sqlStatement.getNames();
- check(databaseName, toBeDroppedResourceNames, sqlStatement.isIgnoreSingleTables(), sqlStatement.isContainsExistClause());
+ check(databaseName, toBeDroppedResourceNames, sqlStatement.isIgnoreSingleTables(), sqlStatement.isIfExist());
ProxyContext.getInstance().getContextManager().dropResource(databaseName, toBeDroppedResourceNames);
return new UpdateResponseHeader(sqlStatement);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java
index 8d8788a55bd..42d08a24a38 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/DropDefaultSingleTableRuleStatementUpdater.java
@@ -37,7 +37,7 @@ public final class DropDefaultSingleTableRuleStatementUpdater implements RuleDef
private void checkCurrentRuleConfiguration(final String databaseName,
final DropDefaultSingleTableRuleStatement sqlStatement, final SingleTableRuleConfiguration currentRuleConfig) throws DistSQLException {
- if (!sqlStatement.isContainsExistClause()) {
+ if (!sqlStatement.isIfExist()) {
DistSQLException.predictionThrow(null != currentRuleConfig && currentRuleConfig.getDefaultDataSource().isPresent(), () -> new RequiredRuleMissedException("single table", databaseName));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java
index eb9279c32b0..e75ab1728f3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java
@@ -139,7 +139,7 @@ public final class ProxySQLExecutorTest extends ProxyContextRestorer {
}
private CreateTableStatementContext createMySQLCreateTableStatementContext() {
- MySQLCreateTableStatement sqlStatement = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement sqlStatement = new MySQLCreateTableStatement(false);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
return new CreateTableStatementContext(sqlStatement);
}
@@ -153,7 +153,7 @@ public final class ProxySQLExecutorTest extends ProxyContextRestorer {
}
private CreateTableStatementContext createPostgreSQLCreateTableStatementContext() {
- PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement();
+ PostgreSQLCreateTableStatement sqlStatement = new PostgreSQLCreateTableStatement(false);
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
return new CreateTableStatementContext(sqlStatement);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandlerTest.java
index f228230552a..ce50e6c9e58 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/database/CreateDatabaseBackendHandlerTest.java
@@ -76,7 +76,7 @@ public final class CreateDatabaseBackendHandlerTest extends ProxyContextRestorer
@Test
public void assertExecuteCreateExistDatabaseWithIfNotExists() {
when(statement.getDatabaseName()).thenReturn("test_db");
- when(statement.isContainsNotExistClause()).thenReturn(true);
+ when(statement.isIfNotExist()).thenReturn(true);
assertThat(handler.execute(), instanceOf(UpdateResponseHeader.class));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandlerTest.java
index e4a626f884b..82852fcc719 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/database/DropDatabaseBackendHandlerTest.java
@@ -84,7 +84,7 @@ public final class DropDatabaseBackendHandlerTest extends ProxyContextRestorer {
@Test
public void assertExecuteDropNotExistDatabaseWithIfExists() {
when(sqlStatement.getDatabaseName()).thenReturn("test_not_exist_db");
- when(sqlStatement.isContainsExistClause()).thenReturn(true);
+ when(sqlStatement.isIfExist()).thenReturn(true);
handler.execute();
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareCheckerTest.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareCheckerTest.java
index 904367d69f6..c573411ef20 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareCheckerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareCheckerTest.java
@@ -82,8 +82,8 @@ public final class MySQLComStmtPrepareCheckerTest {
Collection<SQLStatement> sqlStatements = Arrays.asList(
new MySQLAlterTableStatement(), new MySQLAlterUserStatement(), new MySQLAnalyzeTableStatement(), new MySQLCacheIndexStatement(),
new MySQLCallStatement(), new MySQLChangeMasterStatement(), new MySQLChecksumTableStatement(), new MySQLCommitStatement(), new MySQLCreateIndexStatement(),
- new MySQLDropIndexStatement(), new MySQLCreateDatabaseStatement(), new MySQLDropDatabaseStatement(), new MySQLCreateTableStatement(),
- new MySQLDropTableStatement(), new MySQLCreateUserStatement(), new MySQLRenameUserStatement(), new MySQLDropUserStatement(),
+ new MySQLDropIndexStatement(), new MySQLCreateDatabaseStatement(), new MySQLDropDatabaseStatement(), new MySQLCreateTableStatement(false),
+ new MySQLDropTableStatement(false), new MySQLCreateUserStatement(), new MySQLRenameUserStatement(), new MySQLDropUserStatement(),
new MySQLCreateViewStatement(), new MySQLDropViewStatement(), new MySQLDeleteStatement(), new MySQLDoStatement(), new MySQLFlushStatement(),
new MySQLGrantStatement(), new MySQLInsertStatement(), new MySQLInstallPluginStatement(), new MySQLKillStatement(),
new MySQLLoadIndexInfoStatement(), new MySQLOptimizeTableStatement(), new MySQLRenameTableStatement(), new MySQLRepairTableStatement(),
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/MySQLDALStatementSQLVisitor.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/MySQLDALStatementSQLVisitor.java
index ba46b597647..76c52f7063a 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/MySQLDALStatementSQLVisitor.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/MySQLDALStatementSQLVisitor.java
@@ -354,14 +354,7 @@ public final class MySQLDALStatementSQLVisitor extends MySQLStatementSQLVisitor
@Override
public ASTNode visitResetPersist(final ResetPersistContext ctx) {
- MySQLResetPersistStatement result = new MySQLResetPersistStatement();
- if (null != ctx.existClause()) {
- result.setContainsExistClause(true);
- }
- if (null != ctx.identifier()) {
- result.setIdentifier(new IdentifierValue(ctx.identifier().getText()));
- }
- return result;
+ return new MySQLResetPersistStatement(null != ctx.existClause(), null == ctx.identifier() ? null : new IdentifierValue(ctx.identifier().getText()));
}
@Override
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/MySQLDDLStatementSQLVisitor.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/MySQLDDLStatementSQLVisitor.java
index 2709154b825..1ea113dc3f0 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/MySQLDDLStatementSQLVisitor.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/MySQLDDLStatementSQLVisitor.java
@@ -214,7 +214,7 @@ public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor
public ASTNode visitCreateDatabase(final CreateDatabaseContext ctx) {
MySQLCreateDatabaseStatement result = new MySQLCreateDatabaseStatement();
result.setDatabaseName(new IdentifierValue(ctx.schemaName().getText()).getValue());
- result.setContainsNotExistClause(null != ctx.notExistClause());
+ result.setIfNotExist(null != ctx.notExistClause());
return result;
}
@@ -227,16 +227,15 @@ public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor
public ASTNode visitDropDatabase(final DropDatabaseContext ctx) {
MySQLDropDatabaseStatement result = new MySQLDropDatabaseStatement();
result.setDatabaseName(new IdentifierValue(ctx.schemaName().getText()).getValue());
- result.setContainsExistClause(null != ctx.existClause());
+ result.setIfExist(null != ctx.existClause());
return result;
}
@SuppressWarnings("unchecked")
@Override
public ASTNode visitCreateTable(final CreateTableContext ctx) {
- MySQLCreateTableStatement result = new MySQLCreateTableStatement();
+ MySQLCreateTableStatement result = new MySQLCreateTableStatement(null != ctx.notExistClause());
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.setContainsNotExistClause(null != ctx.notExistClause());
if (null != ctx.createDefinitionClause()) {
CollectionValue<CreateDefinitionSegment> createDefinitions = (CollectionValue<CreateDefinitionSegment>) visit(ctx.createDefinitionClause());
for (CreateDefinitionSegment each : createDefinitions.getValue()) {
@@ -532,9 +531,8 @@ public final class MySQLDDLStatementSQLVisitor extends MySQLStatementSQLVisitor
@SuppressWarnings("unchecked")
@Override
public ASTNode visitDropTable(final DropTableContext ctx) {
- MySQLDropTableStatement result = new MySQLDropTableStatement();
+ MySQLDropTableStatement result = new MySQLDropTableStatement(null != ctx.existClause());
result.getTables().addAll(((CollectionValue<SimpleTableSegment>) visit(ctx.tableList())).getValue());
- result.setContainsExistClause(null != ctx.existClause());
return result;
}
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/OpenGaussDDLStatementSQLVisitor.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/OpenGaussDDLStatementSQLVisitor.java
index db466a9a8ab..90cdd16782e 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/OpenGaussDDLStatementSQLVisitor.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/OpenGaussDDLStatementSQLVisitor.java
@@ -259,9 +259,8 @@ public final class OpenGaussDDLStatementSQLVisitor extends OpenGaussStatementSQL
@SuppressWarnings("unchecked")
@Override
public ASTNode visitCreateTable(final CreateTableContext ctx) {
- OpenGaussCreateTableStatement result = new OpenGaussCreateTableStatement();
+ OpenGaussCreateTableStatement result = new OpenGaussCreateTableStatement(null != ctx.notExistClause());
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.setContainsNotExistClause(null != ctx.notExistClause());
if (null != ctx.createDefinitionClause()) {
CollectionValue<CreateDefinitionSegment> createDefinitions = (CollectionValue<CreateDefinitionSegment>) visit(ctx.createDefinitionClause());
for (CreateDefinitionSegment each : createDefinitions.getValue()) {
@@ -489,9 +488,8 @@ public final class OpenGaussDDLStatementSQLVisitor extends OpenGaussStatementSQL
@SuppressWarnings("unchecked")
@Override
public ASTNode visitDropTable(final DropTableContext ctx) {
- OpenGaussDropTableStatement result = new OpenGaussDropTableStatement();
+ OpenGaussDropTableStatement result = new OpenGaussDropTableStatement(null != ctx.existClause());
result.getTables().addAll(((CollectionValue<SimpleTableSegment>) visit(ctx.tableNames())).getValue());
- result.setContainsExistClause(null != ctx.existClause());
return result;
}
@@ -548,9 +546,8 @@ public final class OpenGaussDDLStatementSQLVisitor extends OpenGaussStatementSQL
@SuppressWarnings("unchecked")
@Override
public ASTNode visitDropIndex(final DropIndexContext ctx) {
- OpenGaussDropIndexStatement result = new OpenGaussDropIndexStatement();
+ OpenGaussDropIndexStatement result = new OpenGaussDropIndexStatement(null != ctx.existClause());
result.getIndexes().addAll(createIndexSegments(((CollectionValue<SimpleTableSegment>) visit(ctx.qualifiedNameList())).getValue()));
- result.setContainsExistClause(null != ctx.existClause());
return result;
}
@@ -644,7 +641,7 @@ public final class OpenGaussDDLStatementSQLVisitor extends OpenGaussStatementSQL
public ASTNode visitDropDatabase(final DropDatabaseContext ctx) {
OpenGaussDropDatabaseStatement result = new OpenGaussDropDatabaseStatement();
result.setDatabaseName(((IdentifierValue) visit(ctx.name())).getValue());
- result.setContainsExistClause(null != ctx.existClause());
+ result.setIfExist(null != ctx.existClause());
return result;
}
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/PostgreSQLDDLStatementSQLVisitor.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/PostgreSQLDDLStatementSQLVisitor.java
index d8b00e96812..ede50027119 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/PostgreSQLDDLStatementSQLVisitor.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/PostgreSQLDDLStatementSQLVisitor.java
@@ -291,9 +291,8 @@ public final class PostgreSQLDDLStatementSQLVisitor extends PostgreSQLStatementS
@SuppressWarnings("unchecked")
@Override
public ASTNode visitCreateTable(final CreateTableContext ctx) {
- PostgreSQLCreateTableStatement result = new PostgreSQLCreateTableStatement();
+ PostgreSQLCreateTableStatement result = new PostgreSQLCreateTableStatement(null != ctx.notExistClause());
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.setContainsNotExistClause(null != ctx.notExistClause());
if (null != ctx.createDefinitionClause()) {
CollectionValue<CreateDefinitionSegment> createDefinitions = (CollectionValue<CreateDefinitionSegment>) visit(ctx.createDefinitionClause());
for (CreateDefinitionSegment each : createDefinitions.getValue()) {
@@ -551,9 +550,8 @@ public final class PostgreSQLDDLStatementSQLVisitor extends PostgreSQLStatementS
@SuppressWarnings("unchecked")
@Override
public ASTNode visitDropTable(final DropTableContext ctx) {
- PostgreSQLDropTableStatement result = new PostgreSQLDropTableStatement();
+ PostgreSQLDropTableStatement result = new PostgreSQLDropTableStatement(null != ctx.existClause());
result.getTables().addAll(((CollectionValue<SimpleTableSegment>) visit(ctx.tableNames())).getValue());
- result.setContainsExistClause(null != ctx.existClause());
return result;
}
@@ -635,9 +633,8 @@ public final class PostgreSQLDDLStatementSQLVisitor extends PostgreSQLStatementS
@SuppressWarnings("unchecked")
@Override
public ASTNode visitDropIndex(final DropIndexContext ctx) {
- PostgreSQLDropIndexStatement result = new PostgreSQLDropIndexStatement();
+ PostgreSQLDropIndexStatement result = new PostgreSQLDropIndexStatement(null != ctx.existClause());
result.getIndexes().addAll(createIndexSegments(((CollectionValue<SimpleTableSegment>) visit(ctx.qualifiedNameList())).getValue()));
- result.setContainsExistClause(null != ctx.existClause());
return result;
}
@@ -736,7 +733,7 @@ public final class PostgreSQLDDLStatementSQLVisitor extends PostgreSQLStatementS
public ASTNode visitDropDatabase(final DropDatabaseContext ctx) {
PostgreSQLDropDatabaseStatement result = new PostgreSQLDropDatabaseStatement();
result.setDatabaseName(((IdentifierValue) visit(ctx.name())).getValue());
- result.setContainsExistClause(null != ctx.existClause());
+ result.setIfExist(null != ctx.existClause());
return result;
}
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/SQLServerDDLStatementSQLVisitor.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/SQLServerDDLStatementSQLVisitor.java
index 55fff3c9164..d55d5379b39 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/SQLServerDDLStatementSQLVisitor.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/SQLServerDDLStatementSQLVisitor.java
@@ -134,24 +134,16 @@ public final class SQLServerDDLStatementSQLVisitor extends SQLServerStatementSQL
super(props);
}
- @SuppressWarnings("unchecked")
@Override
public ASTNode visitCreateTable(final CreateTableContext ctx) {
- SQLServerCreateTableStatement result;
- if (null != ctx.createTableClause()) {
- result = (SQLServerCreateTableStatement) visit(ctx.createTableClause());
- } else {
- result = (SQLServerCreateTableStatement) visit(ctx.createTableAsSelectClause());
- }
- return result;
+ return null == ctx.createTableClause() ? visit(ctx.createTableAsSelectClause()) : visit(ctx.createTableClause());
}
@Override
public ASTNode visitCreateTableClause(final CreateTableClauseContext ctx) {
SQLServerCreateTableStatement result = new SQLServerCreateTableStatement();
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- CollectionValue<CreateDefinitionSegment> createDefinitions =
- (CollectionValue<CreateDefinitionSegment>) generateCreateDefinitionSegment(ctx.createDefinitionClause().createTableDefinitions());
+ CollectionValue<CreateDefinitionSegment> createDefinitions = (CollectionValue<CreateDefinitionSegment>) generateCreateDefinitionSegment(ctx.createDefinitionClause().createTableDefinitions());
for (CreateDefinitionSegment each : createDefinitions.getValue()) {
if (each instanceof ColumnDefinitionSegment) {
result.getColumnDefinitions().add((ColumnDefinitionSegment) each);
@@ -318,9 +310,8 @@ public final class SQLServerDDLStatementSQLVisitor extends SQLServerStatementSQL
@SuppressWarnings("unchecked")
@Override
public ASTNode visitDropTable(final DropTableContext ctx) {
- SQLServerDropTableStatement result = new SQLServerDropTableStatement();
+ SQLServerDropTableStatement result = new SQLServerDropTableStatement(null != ctx.ifExist());
result.getTables().addAll(((CollectionValue<SimpleTableSegment>) visit(ctx.tableNames())).getValue());
- result.setContainsExistClause(null != ctx.ifExist());
return result;
}
@@ -366,10 +357,9 @@ public final class SQLServerDDLStatementSQLVisitor extends SQLServerStatementSQL
@Override
public ASTNode visitDropIndex(final DropIndexContext ctx) {
- SQLServerDropIndexStatement result = new SQLServerDropIndexStatement();
+ SQLServerDropIndexStatement result = new SQLServerDropIndexStatement(null != ctx.ifExist());
result.getIndexes().add((IndexSegment) visit(ctx.indexName()));
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.setContainsExistClause(null != ctx.ifExist());
return result;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/CreateDatabaseStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/CreateDatabaseStatement.java
index 82bb47eade6..7c43259ef0e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/CreateDatabaseStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/CreateDatabaseStatement.java
@@ -32,5 +32,5 @@ public abstract class CreateDatabaseStatement extends AbstractSQLStatement imple
private String databaseName;
- private boolean containsNotExistClause;
+ private boolean ifNotExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/DropDatabaseStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/DropDatabaseStatement.java
index 8430b7ba755..21d20521e46 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/DropDatabaseStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/DropDatabaseStatement.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStat
@ToString
public abstract class DropDatabaseStatement extends AbstractSQLStatement implements DDLStatement {
- private boolean containsExistClause;
+ private boolean ifExist;
private String databaseName;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateTableStatementHandler.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateTableStatementHandler.java
index 66918f1bc64..420e129d17a 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateTableStatementHandler.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateTableStatementHandler.java
@@ -50,13 +50,13 @@ public final class CreateTableStatementHandler implements SQLStatementHandler {
*/
public static boolean containsNotExistClause(final CreateTableStatement createTableStatement) {
if (createTableStatement instanceof MySQLStatement) {
- return ((MySQLCreateTableStatement) createTableStatement).isContainsNotExistClause();
+ return ((MySQLCreateTableStatement) createTableStatement).isIfNotExist();
}
if (createTableStatement instanceof PostgreSQLStatement) {
- return ((PostgreSQLCreateTableStatement) createTableStatement).isContainsNotExistClause();
+ return ((PostgreSQLCreateTableStatement) createTableStatement).isIfNotExist();
}
if (createTableStatement instanceof OpenGaussStatement) {
- return ((OpenGaussCreateTableStatement) createTableStatement).isContainsNotExistClause();
+ return ((OpenGaussCreateTableStatement) createTableStatement).isIfNotExist();
}
return false;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandler.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandler.java
index 757c88ed6f2..9ec3ab9adb8 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandler.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandler.java
@@ -63,13 +63,13 @@ public final class DropIndexStatementHandler implements SQLStatementHandler {
*/
public static boolean containsExistClause(final DropIndexStatement dropIndexStatement) {
if (dropIndexStatement instanceof PostgreSQLStatement) {
- return ((PostgreSQLDropIndexStatement) dropIndexStatement).isContainsExistClause();
+ return ((PostgreSQLDropIndexStatement) dropIndexStatement).isIfExist();
}
if (dropIndexStatement instanceof SQLServerStatement) {
- return ((SQLServerDropIndexStatement) dropIndexStatement).isContainsExistClause();
+ return ((SQLServerDropIndexStatement) dropIndexStatement).isIfExist();
}
if (dropIndexStatement instanceof OpenGaussStatement) {
- return ((OpenGaussDropIndexStatement) dropIndexStatement).isContainsExistClause();
+ return ((OpenGaussDropIndexStatement) dropIndexStatement).isIfExist();
}
return false;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandler.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandler.java
index 370f701c700..11e3c5051a9 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandler.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandler.java
@@ -44,16 +44,16 @@ public final class DropTableStatementHandler implements SQLStatementHandler {
*/
public static boolean containsExistClause(final DropTableStatement dropTableStatement) {
if (dropTableStatement instanceof MySQLStatement) {
- return ((MySQLDropTableStatement) dropTableStatement).isContainsExistClause();
+ return ((MySQLDropTableStatement) dropTableStatement).isIfExist();
}
if (dropTableStatement instanceof PostgreSQLStatement) {
- return ((PostgreSQLDropTableStatement) dropTableStatement).isContainsExistClause();
+ return ((PostgreSQLDropTableStatement) dropTableStatement).isIfExist();
}
if (dropTableStatement instanceof SQLServerStatement) {
- return ((SQLServerDropTableStatement) dropTableStatement).isContainsExistClause();
+ return ((SQLServerDropTableStatement) dropTableStatement).isIfExist();
}
if (dropTableStatement instanceof OpenGaussStatement) {
- return ((OpenGaussDropTableStatement) dropTableStatement).isContainsExistClause();
+ return ((OpenGaussDropTableStatement) dropTableStatement).isIfExist();
}
return false;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dal/MySQLResetPersistStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dal/MySQLResetPersistStatement.java
index 8a40c7160ad..2c3ac1b6996 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dal/MySQLResetPersistStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dal/MySQLResetPersistStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.DALStatement;
@@ -28,12 +28,12 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLSta
/**
* MySQL reset persist statement.
*/
-@ToString
+@RequiredArgsConstructor
@Getter
-@Setter
+@ToString
public final class MySQLResetPersistStatement extends AbstractSQLStatement implements DALStatement, MySQLStatement {
- private boolean containsExistClause;
+ private final boolean ifExist;
- private IdentifierValue identifier;
+ private final IdentifierValue identifier;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/ddl/MySQLCreateTableStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/ddl/MySQLCreateTableStatement.java
index 9b46578d35e..a1d0575995e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/ddl/MySQLCreateTableStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/ddl/MySQLCreateTableStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLSta
/**
* MySQL create table statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class MySQLCreateTableStatement extends CreateTableStatement implements MySQLStatement {
- private boolean containsNotExistClause;
+ private final boolean ifNotExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/ddl/MySQLDropTableStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/ddl/MySQLDropTableStatement.java
index f09ecc9b324..5da48312b65 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/ddl/MySQLDropTableStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/ddl/MySQLDropTableStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropTableStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLSta
/**
* MySQL drop table statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class MySQLDropTableStatement extends DropTableStatement implements MySQLStatement {
- private boolean containsExistClause;
+ private final boolean ifExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussCreateTableStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussCreateTableStatement.java
index ad4e1dfc033..61684f69011 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussCreateTableStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussCreateTableStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.OpenGaussStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.Open
/**
* OpenGauss create table statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class OpenGaussCreateTableStatement extends CreateTableStatement implements OpenGaussStatement {
- private boolean containsNotExistClause;
+ private final boolean ifNotExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussDropIndexStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussDropIndexStatement.java
index 115b2c3e8c3..ad2d26d7e82 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussDropIndexStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussDropIndexStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropIndexStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.OpenGaussStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.Open
/**
* OpenGauss drop index statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class OpenGaussDropIndexStatement extends DropIndexStatement implements OpenGaussStatement {
- private boolean containsExistClause;
+ private final boolean ifExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussDropTableStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussDropTableStatement.java
index 97f9d40a526..c54d528e840 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussDropTableStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/ddl/OpenGaussDropTableStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropTableStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.OpenGaussStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.Open
/**
* OpenGauss drop table statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class OpenGaussDropTableStatement extends DropTableStatement implements OpenGaussStatement {
- private boolean containsExistClause;
+ private final boolean ifExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLCreateTableStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLCreateTableStatement.java
index daace75965e..2dca925c125 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLCreateTableStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLCreateTableStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.PostgreSQLStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.Pos
/**
* PostgreSQL create table statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class PostgreSQLCreateTableStatement extends CreateTableStatement implements PostgreSQLStatement {
- private boolean containsNotExistClause;
+ private final boolean ifNotExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLDropIndexStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLDropIndexStatement.java
index f273f23735d..a4dd0ed2853 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLDropIndexStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLDropIndexStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropIndexStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.PostgreSQLStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.Pos
/**
* PostgreSQL drop index statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class PostgreSQLDropIndexStatement extends DropIndexStatement implements PostgreSQLStatement {
- private boolean containsExistClause;
+ private final boolean ifExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLDropTableStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLDropTableStatement.java
index 65deaa1534f..0f68a48b392 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLDropTableStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/ddl/PostgreSQLDropTableStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropTableStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.PostgreSQLStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.Pos
/**
* PostgreSQL drop table statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class PostgreSQLDropTableStatement extends DropTableStatement implements PostgreSQLStatement {
- private boolean containsExistClause;
+ private final boolean ifExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/ddl/SQLServerDropIndexStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/ddl/SQLServerDropIndexStatement.java
index e21e26ac07b..326a33d950b 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/ddl/SQLServerDropIndexStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/ddl/SQLServerDropIndexStatement.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.ddl;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
@@ -29,14 +30,15 @@ import java.util.Optional;
/**
* SQLServer drop index statement.
*/
+@RequiredArgsConstructor
@Getter
@Setter
@ToString
public final class SQLServerDropIndexStatement extends DropIndexStatement implements SQLServerStatement {
- private SimpleTableSegment table;
+ private final boolean ifExist;
- private boolean containsExistClause;
+ private SimpleTableSegment table;
/**
* Get simple table segment.
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/ddl/SQLServerDropTableStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/ddl/SQLServerDropTableStatement.java
index b2e5528dd9d..c10810a4fef 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/ddl/SQLServerDropTableStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/ddl/SQLServerDropTableStatement.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.ddl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import lombok.ToString;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropTableStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.SQLServerStatement;
@@ -26,10 +26,10 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.SQLS
/**
* SQLServer drop table statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
@ToString
public final class SQLServerDropTableStatement extends DropTableStatement implements SQLServerStatement {
- private boolean containsExistClause;
+ private final boolean ifExist;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateTableStatementHandlerTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateTableStatementHandlerTest.java
index 46948a120c7..17c30fd4d07 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateTableStatementHandlerTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/CreateTableStatementHandlerTest.java
@@ -31,54 +31,36 @@ public final class CreateTableStatementHandlerTest {
@Test
public void assertContainsIfNotExistClauseForMySQL() {
- MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement();
- createTableStatement.setContainsNotExistClause(true);
- boolean containsNotExistClause = CreateTableStatementHandler.containsNotExistClause(createTableStatement);
- assertTrue(containsNotExistClause);
+ assertTrue(CreateTableStatementHandler.containsNotExistClause(new MySQLCreateTableStatement(true)));
}
@Test
public void assertContainsIfNotExistClauseForPostgreSQL() {
- PostgreSQLCreateTableStatement createTableStatement = new PostgreSQLCreateTableStatement();
- createTableStatement.setContainsNotExistClause(true);
- boolean containsNotExistClause = CreateTableStatementHandler.containsNotExistClause(createTableStatement);
- assertTrue(containsNotExistClause);
+ assertTrue(CreateTableStatementHandler.containsNotExistClause(new PostgreSQLCreateTableStatement(true)));
}
@Test
public void assertNotContainsIfNotExistClauseForMySQL() {
- MySQLCreateTableStatement createTableStatement = new MySQLCreateTableStatement();
- createTableStatement.setContainsNotExistClause(false);
- boolean containsNotExistClause = CreateTableStatementHandler.containsNotExistClause(createTableStatement);
- assertFalse(containsNotExistClause);
+ assertFalse(CreateTableStatementHandler.containsNotExistClause(new MySQLCreateTableStatement(false)));
}
@Test
public void assertNotContainsIfNotExistClauseForOracle() {
- OracleCreateTableStatement createTableStatement = new OracleCreateTableStatement();
- boolean containsNotExistClause = CreateTableStatementHandler.containsNotExistClause(createTableStatement);
- assertFalse(containsNotExistClause);
+ assertFalse(CreateTableStatementHandler.containsNotExistClause(new OracleCreateTableStatement()));
}
@Test
public void assertNotContainsIfNotExistClauseForPostgreSQL() {
- PostgreSQLCreateTableStatement createTableStatement = new PostgreSQLCreateTableStatement();
- createTableStatement.setContainsNotExistClause(false);
- boolean containsNotExistClause = CreateTableStatementHandler.containsNotExistClause(createTableStatement);
- assertFalse(containsNotExistClause);
+ assertFalse(CreateTableStatementHandler.containsNotExistClause(new PostgreSQLCreateTableStatement(false)));
}
@Test
public void assertNotContainsNotExistClauseForSQL92() {
- SQL92CreateTableStatement createTableStatement = new SQL92CreateTableStatement();
- boolean containsNotExistClause = CreateTableStatementHandler.containsNotExistClause(createTableStatement);
- assertFalse(containsNotExistClause);
+ assertFalse(CreateTableStatementHandler.containsNotExistClause(new SQL92CreateTableStatement()));
}
@Test
public void assertNotContainsIfNotExistClauseForSQLServer() {
- SQLServerCreateTableStatement createTableStatement = new SQLServerCreateTableStatement();
- boolean containsNotExistClause = CreateTableStatementHandler.containsNotExistClause(createTableStatement);
- assertFalse(containsNotExistClause);
+ assertFalse(CreateTableStatementHandler.containsNotExistClause(new SQLServerCreateTableStatement()));
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java
index 245b4a06465..92c3d2693ae 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropIndexStatementHandlerTest.java
@@ -48,7 +48,7 @@ public final class DropIndexStatementHandlerTest {
@Test
public void assertGetSimpleTableSegmentWithSimpleTableSegmentForSQLServer() {
- SQLServerDropIndexStatement dropIndexStatement = new SQLServerDropIndexStatement();
+ SQLServerDropIndexStatement dropIndexStatement = new SQLServerDropIndexStatement(false);
dropIndexStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue(""))));
Optional<SimpleTableSegment> simpleTableSegment = DropIndexStatementHandler.getSimpleTableSegment(dropIndexStatement);
assertTrue(simpleTableSegment.isPresent());
@@ -56,7 +56,7 @@ public final class DropIndexStatementHandlerTest {
@Test
public void assertGetSimpleTableSegmentWithoutSimpleTableSegmentForSQLServer() {
- SQLServerDropIndexStatement dropIndexStatement = new SQLServerDropIndexStatement();
+ SQLServerDropIndexStatement dropIndexStatement = new SQLServerDropIndexStatement(false);
Optional<SimpleTableSegment> simpleTableSegment = DropIndexStatementHandler.getSimpleTableSegment(dropIndexStatement);
assertFalse(simpleTableSegment.isPresent());
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
index d0d74c6d8df..74180436c96 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/dialect/handler/ddl/DropTableStatementHandlerTest.java
@@ -31,55 +31,41 @@ public final class DropTableStatementHandlerTest {
@Test
public void assertContainsIfExistClauseForMySQL() {
- MySQLDropTableStatement dropTableStatement = new MySQLDropTableStatement();
- dropTableStatement.setContainsExistClause(true);
- assertTrue(DropTableStatementHandler.containsExistClause(dropTableStatement));
+ assertTrue(DropTableStatementHandler.containsExistClause(new MySQLDropTableStatement(true)));
}
@Test
public void assertContainsIfExistClauseForPostgreSQL() {
- PostgreSQLDropTableStatement dropTableStatement = new PostgreSQLDropTableStatement();
- dropTableStatement.setContainsExistClause(true);
- assertTrue(DropTableStatementHandler.containsExistClause(dropTableStatement));
+ assertTrue(DropTableStatementHandler.containsExistClause(new PostgreSQLDropTableStatement(true)));
}
@Test
public void assertContainsIfExistClauseForSQLServer() {
- SQLServerDropTableStatement dropTableStatement = new SQLServerDropTableStatement();
- dropTableStatement.setContainsExistClause(true);
- assertTrue(DropTableStatementHandler.containsExistClause(dropTableStatement));
+ assertTrue(DropTableStatementHandler.containsExistClause(new SQLServerDropTableStatement(true)));
}
@Test
public void assertNotContainsIfExistClauseForMySQL() {
- MySQLDropTableStatement dropTableStatement = new MySQLDropTableStatement();
- dropTableStatement.setContainsExistClause(false);
- assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
+ assertFalse(DropTableStatementHandler.containsExistClause(new MySQLDropTableStatement(false)));
}
@Test
public void assertNotContainsIfExistClauseForOracle() {
- OracleDropTableStatement dropTableStatement = new OracleDropTableStatement();
- assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
+ assertFalse(DropTableStatementHandler.containsExistClause(new OracleDropTableStatement()));
}
@Test
public void assertNotContainsIfExistClauseForPostgreSQL() {
- PostgreSQLDropTableStatement dropTableStatement = new PostgreSQLDropTableStatement();
- dropTableStatement.setContainsExistClause(false);
- assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
+ assertFalse(DropTableStatementHandler.containsExistClause(new PostgreSQLDropTableStatement(false)));
}
@Test
public void assertNotContainsIfExistClauseForSQL92() {
- SQL92DropTableStatement dropTableStatement = new SQL92DropTableStatement();
- assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
+ assertFalse(DropTableStatementHandler.containsExistClause(new SQL92DropTableStatement()));
}
@Test
public void assertNotContainsIfExistClauseForSQLServer() {
- SQLServerDropTableStatement dropTableStatement = new SQLServerDropTableStatement();
- dropTableStatement.setContainsExistClause(false);
- assertFalse(DropTableStatementHandler.containsExistClause(dropTableStatement));
+ assertFalse(DropTableStatementHandler.containsExistClause(new SQLServerDropTableStatement(false)));
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dal/impl/MySQLResetPersistStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dal/impl/MySQLResetPersistStatementAssert.java
index 4042ce7c075..10cd2d3d39b 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dal/impl/MySQLResetPersistStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dal/impl/MySQLResetPersistStatementAssert.java
@@ -40,7 +40,7 @@ public final class MySQLResetPersistStatementAssert {
* @param expected expected reset persist statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final MySQLResetPersistStatement actual, final ResetPersistStatementTestCase expected) {
- assertThat(assertContext.getText("Actual reset persist exist clause does not match: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Actual reset persist exist clause does not match: "), actual.isIfExist(), is(expected.isContainsExistClause()));
if (null != expected.getIdentifier()) {
assertThat(assertContext.getText("Actual reset persist identifier does not match: "), actual.getIdentifier().getValue(), is(expected.getIdentifier()));
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/DropResourceStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/DropResourceStatementAssert.java
index 0a0b81d9158..17efea6be0a 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/DropResourceStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/DropResourceStatementAssert.java
@@ -46,7 +46,7 @@ public final class DropResourceStatementAssert {
} else {
assertThat(assertContext.getText("resource assertion error: "), actual.getNames(), is(expected.getDataSources()));
assertThat(assertContext.getText("resource assertion error: "), actual.isIgnoreSingleTables(), is(expected.getIgnoreSingleTables().iterator().next()));
- assertThat(assertContext.getText("resource assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("resource assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryHeartbeatStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryHeartbeatStatementAssert.java
index 5e59176e725..1bceee1b623 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryHeartbeatStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryHeartbeatStatementAssert.java
@@ -47,7 +47,7 @@ public final class DropDatabaseDiscoveryHeartbeatStatementAssert {
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("database discovery heartbeat assertion error: "), actual.getHeartbeatNames(), is(expected.getHeartbeats()));
- assertThat(assertContext.getText("database discovery heartbeat assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("database discovery heartbeat assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryTypeStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryTypeStatementAssert.java
index 695e9234ad6..d5e26859fcf 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryTypeStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDatabaseDiscoveryTypeStatementAssert.java
@@ -47,7 +47,7 @@ public final class DropDatabaseDiscoveryTypeStatementAssert {
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("database discovery type assertion error: "), actual.getTypes(), is(expected.getTypes()));
- assertThat(assertContext.getText("database discovery type assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("database discovery type assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDefaultShardingStrategyStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDefaultShardingStrategyStatementAssert.java
index 637c2c55e41..7522273e051 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDefaultShardingStrategyStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDefaultShardingStrategyStatementAssert.java
@@ -47,7 +47,7 @@ public final class DropDefaultShardingStrategyStatementAssert {
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("default sharding strategy assertion error: "), actual.getDefaultType(), is(expected.getDefaultType()));
- assertThat(assertContext.getText("default sharding strategy assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("default sharding strategy assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDefaultSingleTableRuleAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDefaultSingleTableRuleAssert.java
index bf472f1774a..ce76c5942bd 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDefaultSingleTableRuleAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropDefaultSingleTableRuleAssert.java
@@ -47,7 +47,7 @@ public final class DropDefaultSingleTableRuleAssert {
assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
- assertThat(assertContext.getText("Actual statement should exist."), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Actual statement should exist."), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java
index f6d069e12d5..5a64da527d8 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java
@@ -47,7 +47,7 @@ public final class DropReadwriteSplittingRuleStatementAssert {
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("readwrite splitting assertion error: "), actual.getRuleNames(), is(expected.getRules()));
- assertThat(assertContext.getText("readwrite splitting assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("readwrite splitting assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShadowAlgorithmStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShadowAlgorithmStatementAssert.java
index c703eaa82bd..cb388611562 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShadowAlgorithmStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShadowAlgorithmStatementAssert.java
@@ -47,7 +47,7 @@ public final class DropShadowAlgorithmStatementAssert {
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("Shadow rule assertion error: "), actual.getAlgorithmNames(), is(expected.getRuleName()));
- assertThat(assertContext.getText("Shadow rule assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Shadow rule assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShadowRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShadowRuleStatementAssert.java
index f524e130ac9..06c77b942d5 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShadowRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShadowRuleStatementAssert.java
@@ -47,7 +47,7 @@ public final class DropShadowRuleStatementAssert {
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("Shadow rule assertion error: "), actual.getRuleNames(), is(expected.getRuleName()));
- assertThat(assertContext.getText("Shadow rule assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Shadow rule assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingAlgorithmStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingAlgorithmStatementAssert.java
index c3ae09249f1..389a8e244d4 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingAlgorithmStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingAlgorithmStatementAssert.java
@@ -45,7 +45,7 @@ public final class DropShardingAlgorithmStatementAssert {
assertNull(assertContext.getText("Actual algorithm should not exist."), actual);
} else {
assertThat(assertContext.getText("Algorithm names assertion error: "), actual.getAlgorithmNames(), is(expected.getAlgorithms()));
- assertThat(assertContext.getText("Contains exist clause assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Contains exist clause assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingBindingTableRulesStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingBindingTableRulesStatementAssert.java
index fd4476be774..59654f12e8f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingBindingTableRulesStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingBindingTableRulesStatementAssert.java
@@ -43,6 +43,6 @@ public final class DropShardingBindingTableRulesStatementAssert {
public static void assertIs(final SQLCaseAssertContext assertContext, final DropShardingBindingTableRulesStatement actual, final DropShardingBindingTableRulesStatementTestCase expected) {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("Binding table rule assertion error: "), actual.getBindingGroups(), is(expected.getRules()));
- assertThat(assertContext.getText("Binding table rule assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Binding table rule assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingBroadcastTableRulesStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingBroadcastTableRulesStatementAssert.java
index 0858d17c131..1f9222ff084 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingBroadcastTableRulesStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingBroadcastTableRulesStatementAssert.java
@@ -47,7 +47,7 @@ public final class DropShardingBroadcastTableRulesStatementAssert {
} else {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("readwrite splitting assertion error: "), actual.getRules(), is(expected.getTableName()));
- assertThat(assertContext.getText("readwrite splitting assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("readwrite splitting assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingKeyGeneratorStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingKeyGeneratorStatementAssert.java
index 79cd54c2eeb..8e475b79821 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingKeyGeneratorStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingKeyGeneratorStatementAssert.java
@@ -45,7 +45,7 @@ public final class DropShardingKeyGeneratorStatementAssert {
assertNull(assertContext.getText("Actual key generator name should not exist."), actual);
} else {
assertThat(assertContext.getText("Key generator names assertion error: "), actual.getKeyGeneratorNames(), is(expected.getKeyGeneratorName()));
- assertThat(assertContext.getText("Contains exist clause assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Contains exist clause assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingScalingRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingScalingRuleStatementAssert.java
index 3cb9dac1fe3..1ec257ac72e 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingScalingRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingScalingRuleStatementAssert.java
@@ -48,7 +48,7 @@ public final class DropShardingScalingRuleStatementAssert {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText(String.format("`%s`'s scaling name assertion error: ", actual.getClass().getSimpleName())),
actual.getScalingName(), is(expected.getScalingName()));
- assertThat(assertContext.getText("Contains exist clause assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Contains exist clause assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingTableRuleStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingTableRuleStatementAssert.java
index 1e3c2e9fc47..e5f510b968f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingTableRuleStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/rdl/drop/impl/DropShardingTableRuleStatementAssert.java
@@ -50,7 +50,7 @@ public final class DropShardingTableRuleStatementAssert {
assertNotNull(assertContext.getText("Actual statement should exist."), actual);
assertThat(assertContext.getText("Sharding table rule assertion error: "), actual.getTableNames().stream().map(each -> each.getIdentifier().getValue()).collect(Collectors.toList()),
is(expected.getTables()));
- assertThat(assertContext.getText("Sharding table rule assertion error: "), actual.isContainsExistClause(), is(expected.isContainsExistClause()));
+ assertThat(assertContext.getText("Sharding table rule assertion error: "), actual.isIfExist(), is(expected.isContainsExistClause()));
}
}
}