You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/06/02 12:29:53 UTC
(shardingsphere) branch master updated: Rename SQLServerDropLoginStatement (#35574)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a8c5a25f7e3 Rename SQLServerDropLoginStatement (#35574)
a8c5a25f7e3 is described below
commit a8c5a25f7e3be62cf97a6cfdeb40193c2b489414
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Jun 2 20:29:47 2025 +0800
Rename SQLServerDropLoginStatement (#35574)
---
.../visitor/statement/type/SQLServerDCLStatementVisitor.java | 9 +++------
...ropLoginStatement.java => SQLServerDropLoginStatement.java} | 10 +++++-----
.../internal/asserts/statement/dcl/DCLStatementAssert.java | 6 +++---
.../asserts/statement/dcl/impl/DropLoginStatementAssert.java | 4 ++--
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementVisitor.java b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementVisitor.java
index ae1f00d3cd9..04fb9c6cdc3 100644
--- a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementVisitor.java
+++ b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementVisitor.java
@@ -55,7 +55,7 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.AlterRo
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.CreateRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.CreateUserStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DenyUserStatement;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DropLoginStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.SQLServerDropLoginStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DropRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DropUserStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.RevertStatement;
@@ -247,11 +247,8 @@ public final class SQLServerDCLStatementVisitor extends SQLServerStatementVisito
@Override
public ASTNode visitDropLogin(final DropLoginContext ctx) {
- DropLoginStatement result = new DropLoginStatement();
- LoginSegment loginSegment = new LoginSegment(
- ctx.ignoredNameIdentifier().getStart().getStartIndex(), ctx.ignoredNameIdentifier().getStop().getStopIndex(), (IdentifierValue) visit(ctx.ignoredNameIdentifier()));
- result.setLoginSegment(loginSegment);
- return result;
+ return new SQLServerDropLoginStatement(new LoginSegment(
+ ctx.ignoredNameIdentifier().getStart().getStartIndex(), ctx.ignoredNameIdentifier().getStop().getStopIndex(), (IdentifierValue) visit(ctx.ignoredNameIdentifier())));
}
@Override
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dcl/DropLoginStatement.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dcl/SQLServerDropLoginStatement.java
similarity index 81%
rename from parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dcl/DropLoginStatement.java
rename to parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dcl/SQLServerDropLoginStatement.java
index bdc1c460c23..42edbb34dac 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dcl/DropLoginStatement.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dcl/SQLServerDropLoginStatement.java
@@ -18,16 +18,16 @@
package org.apache.shardingsphere.sql.parser.statement.core.statement.dcl;
import lombok.Getter;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dcl.LoginSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
/**
- * Drop login statement.
+ * SQLServer drop login statement.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
-public class DropLoginStatement extends AbstractSQLStatement implements DCLStatement {
+public final class SQLServerDropLoginStatement extends AbstractSQLStatement implements DCLStatement {
- private LoginSegment loginSegment;
+ private final LoginSegment loginSegment;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/DCLStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/DCLStatementAssert.java
index 4a3f6173dc4..1bf2730e962 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/DCLStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/DCLStatementAssert.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.CreateR
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.CreateUserStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DCLStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DenyUserStatement;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DropLoginStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.SQLServerDropLoginStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DropRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DropUserStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.GrantStatement;
@@ -109,8 +109,8 @@ public final class DCLStatementAssert {
SQLServerCreateLoginStatementAssert.assertIs(assertContext, (SQLServerCreateLoginStatement) actual, (CreateLoginStatementTestCase) expected);
} else if (actual instanceof SQLServerAlterLoginStatement) {
AlterLoginStatementAssert.assertIs(assertContext, (SQLServerAlterLoginStatement) actual, (AlterLoginStatementTestCase) expected);
- } else if (actual instanceof DropLoginStatement) {
- DropLoginStatementAssert.assertIs(assertContext, (DropLoginStatement) actual, (DropLoginStatementTestCase) expected);
+ } else if (actual instanceof SQLServerDropLoginStatement) {
+ DropLoginStatementAssert.assertIs(assertContext, (SQLServerDropLoginStatement) actual, (DropLoginStatementTestCase) expected);
} else if (actual instanceof CreateRoleStatement) {
CreateRoleStatementAssert.assertIs(assertContext, (CreateRoleStatement) actual, (CreateRoleStatementTestCase) expected);
} else if (actual instanceof AlterRoleStatement) {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/DropLoginStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/DropLoginStatementAssert.java
index adf81f74ba6..d4207cbd905 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/DropLoginStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/DropLoginStatementAssert.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.DropLoginStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.dcl.SQLServerDropLoginStatement;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.DropLoginStatementTestCase;
@@ -42,7 +42,7 @@ public final class DropLoginStatementAssert {
* @param actual actual drop login statement
* @param expected expected drop login statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final DropLoginStatement actual, final DropLoginStatementTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext, final SQLServerDropLoginStatement actual, final DropLoginStatementTestCase expected) {
if (null == expected.getLogin()) {
assertNull(actual.getLoginSegment(), assertContext.getText("Actual login should not exist."));
} else {