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/25 18:03:58 UTC
(shardingsphere) branch master updated: Rename and move MySQLSetDefaultRoleStatement and MySQLSetPasswordStatement (#35796)
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 f16bdaf0d7b Rename and move MySQLSetDefaultRoleStatement and MySQLSetPasswordStatement (#35796)
f16bdaf0d7b is described below
commit f16bdaf0d7bbf7ce8cc97e7056f2dd53d483c1ca
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 26 02:03:52 2025 +0800
Rename and move MySQLSetDefaultRoleStatement and MySQLSetPasswordStatement (#35796)
---
.../visitor/statement/type/DorisDCLStatementVisitor.java | 8 ++++----
.../visitor/statement/type/MySQLDCLStatementVisitor.java | 8 ++++----
.../statement/mysql/dcl/MySQLSetDefaultRoleStatement.java} | 8 +++++---
.../statement/mysql/dcl/MySQLSetPasswordStatement.java} | 8 +++++---
.../internal/asserts/statement/dcl/DCLStatementAssert.java | 12 ++++++------
.../statement/dcl/impl/SetDefaultRoleStatementAssert.java | 4 ++--
.../statement/dcl/impl/SetPasswordStatementAssert.java | 4 ++--
7 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDCLStatementVisitor.java b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDCLStatementVisitor.java
index a897cf75645..14f4a9d1b41 100644
--- a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDCLStatementVisitor.java
+++ b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDCLStatementVisitor.java
@@ -101,8 +101,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.Al
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.CreateRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DropRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DropUserStatement;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetDefaultRoleStatement;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetPasswordStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.NumberLiteralValue;
@@ -111,6 +109,8 @@ import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLCreateUserS
import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLGrantStatement;
import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLRenameUserStatement;
import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLRevokeStatement;
+import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLSetDefaultRoleStatement;
+import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLSetPasswordStatement;
import java.util.stream.Collectors;
@@ -730,7 +730,7 @@ public final class DorisDCLStatementVisitor extends DorisStatementVisitor implem
@Override
public ASTNode visitSetDefaultRole(final SetDefaultRoleContext ctx) {
- return new SetDefaultRoleStatement();
+ return new MySQLSetDefaultRoleStatement();
}
@Override
@@ -740,6 +740,6 @@ public final class DorisDCLStatementVisitor extends DorisStatementVisitor implem
@Override
public ASTNode visitSetPassword(final SetPasswordContext ctx) {
- return new SetPasswordStatement();
+ return new MySQLSetPasswordStatement();
}
}
diff --git a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementVisitor.java b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementVisitor.java
index 92a094b8fde..36a32cc14b5 100644
--- a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementVisitor.java
+++ b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementVisitor.java
@@ -101,8 +101,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.Al
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.CreateRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DropRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DropUserStatement;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetDefaultRoleStatement;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetPasswordStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.NumberLiteralValue;
@@ -111,6 +109,8 @@ import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLCreateUserS
import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLGrantStatement;
import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLRenameUserStatement;
import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLRevokeStatement;
+import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLSetDefaultRoleStatement;
+import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLSetPasswordStatement;
import java.util.stream.Collectors;
@@ -727,7 +727,7 @@ public final class MySQLDCLStatementVisitor extends MySQLStatementVisitor implem
@Override
public ASTNode visitSetDefaultRole(final SetDefaultRoleContext ctx) {
- return new SetDefaultRoleStatement();
+ return new MySQLSetDefaultRoleStatement();
}
@Override
@@ -737,6 +737,6 @@ public final class MySQLDCLStatementVisitor extends MySQLStatementVisitor implem
@Override
public ASTNode visitSetPassword(final SetPasswordContext ctx) {
- return new SetPasswordStatement();
+ return new MySQLSetPasswordStatement();
}
}
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/SetPasswordStatement.java b/parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLSetDefaultRoleStatement.java
similarity index 75%
rename from parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/SetPasswordStatement.java
rename to parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLSetDefaultRoleStatement.java
index d8bedb9ab77..49c70af271e 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/SetPasswordStatement.java
+++ b/parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLSetDefaultRoleStatement.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl;
+package org.apache.shardingsphere.sql.parser.statement.mysql.dcl;
+
+import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DCLStatement;
/**
- * Set password statement.
+ * Set default role statement for MySQL.
*/
-public final class SetPasswordStatement extends DCLStatement {
+public final class MySQLSetDefaultRoleStatement extends DCLStatement {
}
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/SetDefaultRoleStatement.java b/parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLSetPasswordStatement.java
similarity index 75%
rename from parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/SetDefaultRoleStatement.java
rename to parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLSetPasswordStatement.java
index 25e87700659..b522fdd73bd 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/SetDefaultRoleStatement.java
+++ b/parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLSetPasswordStatement.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl;
+package org.apache.shardingsphere.sql.parser.statement.mysql.dcl;
+
+import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DCLStatement;
/**
- * Set default role statement.
+ * Set password statement for MySQL.
*/
-public final class SetDefaultRoleStatement extends DCLStatement {
+public final class MySQLSetPasswordStatement extends DCLStatement {
}
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 79ad7d2ce4b..88179cb7ee1 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
@@ -28,10 +28,10 @@ import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.Dr
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DropUserStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.GrantStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.RevokeStatement;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetDefaultRoleStatement;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetPasswordStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.SetRoleStatement;
import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLRenameUserStatement;
+import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLSetDefaultRoleStatement;
+import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLSetPasswordStatement;
import org.apache.shardingsphere.sql.parser.statement.postgresql.dcl.PostgreSQLReassignOwnedStatement;
import org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerAlterLoginStatement;
import org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerCreateLoginStatement;
@@ -119,10 +119,10 @@ public final class DCLStatementAssert {
DropRoleStatementAssert.assertIs(assertContext, (DropRoleStatement) actual, (DropRoleStatementTestCase) expected);
} else if (actual instanceof SetRoleStatement) {
SetRoleStatementAssert.assertIs(assertContext, (SetRoleStatement) actual, (SetRoleStatementTestCase) expected);
- } else if (actual instanceof SetDefaultRoleStatement) {
- SetDefaultRoleStatementAssert.assertIs(assertContext, (SetDefaultRoleStatement) actual, (SetDefaultRoleStatementTestCase) expected);
- } else if (actual instanceof SetPasswordStatement) {
- SetPasswordStatementAssert.assertIs(assertContext, (SetPasswordStatement) actual, (SetPasswordStatementTestCase) expected);
+ } else if (actual instanceof MySQLSetDefaultRoleStatement) {
+ SetDefaultRoleStatementAssert.assertIs(assertContext, (MySQLSetDefaultRoleStatement) actual, (SetDefaultRoleStatementTestCase) expected);
+ } else if (actual instanceof MySQLSetPasswordStatement) {
+ SetPasswordStatementAssert.assertIs(assertContext, (MySQLSetPasswordStatement) actual, (SetPasswordStatementTestCase) expected);
} else if (actual instanceof SQLServerSetUserStatement) {
SQLServerSetUserStatementAssert.assertIs(assertContext, (SQLServerSetUserStatement) actual, (SetUserStatementTestCase) expected);
} else if (actual instanceof PostgreSQLReassignOwnedStatement) {
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/SetDefaultRoleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/SetDefaultRoleStatementAssert.java
index d14a6bb95e0..767d4bdd079 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/SetDefaultRoleStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/SetDefaultRoleStatementAssert.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.type.dcl.SetDefaultRoleStatement;
+import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLSetDefaultRoleStatement;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.SetDefaultRoleStatementTestCase;
@@ -36,6 +36,6 @@ public final class SetDefaultRoleStatementAssert {
* @param actual actual set role statement
* @param expected expected set role statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final SetDefaultRoleStatement actual, final SetDefaultRoleStatementTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext, final MySQLSetDefaultRoleStatement actual, final SetDefaultRoleStatementTestCase expected) {
}
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/SetPasswordStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/SetPasswordStatementAssert.java
index 28c369845a3..21474c88a7e 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/SetPasswordStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/SetPasswordStatementAssert.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.type.dcl.SetPasswordStatement;
+import org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLSetPasswordStatement;
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.dcl.SetPasswordStatementTestCase;
@@ -36,6 +36,6 @@ public final class SetPasswordStatementAssert {
* @param actual actual set password statement
* @param expected expected set password statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final SetPasswordStatement actual, final SetPasswordStatementTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext, final MySQLSetPasswordStatement actual, final SetPasswordStatementTestCase expected) {
}
}