You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/04/11 10:51:45 UTC
[shardingsphere] branch master updated: Proofread SQLServer DROP LOGIN Statement (#16732)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 12191b4faa8 Proofread SQLServer DROP LOGIN Statement (#16732)
12191b4faa8 is described below
commit 12191b4faa87e509bc78f9a74e1f6eb78667b944
Author: Thanoshan MV <48...@users.noreply.github.com>
AuthorDate: Mon Apr 11 16:21:39 2022 +0530
Proofread SQLServer DROP LOGIN Statement (#16732)
---
.../src/main/antlr4/imports/sqlserver/DCLStatement.g4 | 2 +-
.../statement/impl/SQLServerDCLStatementSQLVisitor.java | 6 +++++-
.../sqlserver/dcl/SQLServerDropLoginStatement.java | 7 +++++++
.../statement/dcl/impl/DropLoginStatementAssert.java | 13 +++++++++++++
.../domain/statement/dcl/DropLoginStatementTestCase.java | 8 ++++++++
.../src/main/resources/case/dcl/drop-login.xml | 4 +++-
6 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/DCLStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/DCLStatement.g4
index b14097ca56e..e46caa26e06 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/DCLStatement.g4
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/antlr4/imports/sqlserver/DCLStatement.g4
@@ -433,7 +433,7 @@ createLoginForAnalyticsPlatformSystemOptionListClause
;
dropLogin
- : DROP LOGIN
+ : DROP LOGIN ignoredNameIdentifier
;
alterLogin
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/SQLServerDCLStatementSQLVisitor.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/SQLServerDCLStatementSQLVisitor.java
index 17fba9c3b09..252ac817388 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/SQLServerDCLStatementSQLVisitor.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/SQLServerDCLStatementSQLVisitor.java
@@ -332,7 +332,11 @@ public final class SQLServerDCLStatementSQLVisitor extends SQLServerStatementSQL
@Override
public ASTNode visitDropLogin(final DropLoginContext ctx) {
- return new SQLServerDropLoginStatement();
+ SQLServerDropLoginStatement result = new SQLServerDropLoginStatement();
+ LoginSegment loginSegment = new LoginSegment(ctx.ignoredNameIdentifier().getStart().getStartIndex(), ctx.ignoredNameIdentifier().getStop().getStopIndex(),
+ (IdentifierValue) visit(ctx.ignoredNameIdentifier()));
+ result.setLoginSegment(loginSegment);
+ return result;
}
@Override
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/dcl/SQLServerDropLoginStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/dcl/SQLServerDropLoginStatement.java
index 753a2eb95ae..e8abfb7b8b5 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/dcl/SQLServerDropLoginStatement.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/sqlserver/dcl/SQLServerDropLoginStatement.java
@@ -17,7 +17,10 @@
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.dcl;
+import lombok.Getter;
+import lombok.Setter;
import lombok.ToString;
+import org.apache.shardingsphere.sql.parser.sql.common.segment.dcl.LoginSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.DCLStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.SQLServerStatement;
@@ -26,5 +29,9 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.SQLS
* SQLServer drop login statement.
*/
@ToString
+@Getter
+@Setter
public final class SQLServerDropLoginStatement extends AbstractSQLStatement implements DCLStatement, SQLServerStatement {
+
+ private LoginSegment loginSegment;
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dcl/impl/DropLoginStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dcl/impl/DropLoginStatementAssert.java
index 9443d51a40a..eabd358dc16 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dcl/impl/DropLoginStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dcl/impl/DropLoginStatementAssert.java
@@ -21,8 +21,14 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.dcl.SQLServerDropLoginStatement;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
+import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.dcl.DropLoginStatementTestCase;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
/**
* Drop login statement assert.
*/
@@ -37,5 +43,12 @@ public final class DropLoginStatementAssert {
* @param expected expected drop login statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final SQLServerDropLoginStatement actual, final DropLoginStatementTestCase expected) {
+ if (null != expected.getLogin()) {
+ assertNotNull(assertContext.getText("Actual login should exist."), actual.getLoginSegment());
+ assertThat(assertContext.getText("Login name assertion error: "), actual.getLoginSegment().getLoginName().getValueWithQuoteCharacters(), is(expected.getLogin().getName()));
+ SQLSegmentAssert.assertIs(assertContext, actual.getLoginSegment(), expected.getLogin());
+ } else {
+ assertNull(assertContext.getText("Actual login should not exist."), actual.getLoginSegment());
+ }
}
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/dcl/DropLoginStatementTestCase.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/dcl/DropLoginStatementTestCase.java
index a77ffd3f275..69ee5843b41 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/dcl/DropLoginStatementTestCase.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/dcl/DropLoginStatementTestCase.java
@@ -17,10 +17,18 @@
package org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.dcl;
+import lombok.Getter;
+import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.login.ExpectedLogin;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlElement;
+
/**
* Drop login statement test case.
*/
+@Getter
public final class DropLoginStatementTestCase extends SQLParserTestCase {
+
+ @XmlElement(name = "login")
+ private ExpectedLogin login;
}
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dcl/drop-login.xml b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dcl/drop-login.xml
index af008cb6566..47a5966ac07 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dcl/drop-login.xml
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dcl/drop-login.xml
@@ -17,5 +17,7 @@
-->
<sql-parser-test-cases>
- <drop-login sql-case-id="drop_login" />
+ <drop-login sql-case-id="drop_login" >
+ <login name="login1" start-index="11" stop-index="16"/>
+ </drop-login>
</sql-parser-test-cases>