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 65de23924a1 Rename and move MySQLRenameUserStatement (#35794)
65de23924a1 is described below
commit 65de23924a1409a889eb259f4616dfd209d89811
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Jun 26 01:46:12 2025 +0800
Rename and move MySQLRenameUserStatement (#35794)
---
.../doris/visitor/statement/type/DorisDCLStatementVisitor.java | 4 ++--
.../mysql/visitor/statement/type/MySQLDCLStatementVisitor.java | 4 ++--
.../sql/parser/statement/mysql/dcl/MySQLRenameUserStatement.java} | 8 +++++---
.../command/query/binary/prepare/MySQLComStmtPrepareChecker.java | 4 ++--
.../query/binary/prepare/MySQLComStmtPrepareCheckerTest.java | 4 ++--
.../parser/internal/asserts/statement/dcl/DCLStatementAssert.java | 6 +++---
.../asserts/statement/dcl/impl/RenameUserStatementAssert.java | 4 ++--
7 files changed, 18 insertions(+), 16 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 c2952a19cc3..a897cf75645 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,7 +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.RenameUserStatement;
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;
@@ -110,6 +109,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.Nu
import
org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.StringLiteralValue;
import
org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLCreateUserStatement;
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 java.util.stream.Collectors;
@@ -715,7 +715,7 @@ public final class DorisDCLStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitRenameUser(final RenameUserContext ctx) {
- return new RenameUserStatement();
+ return new MySQLRenameUserStatement();
}
@Override
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 0674d542d99..92a094b8fde 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,7 +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.RenameUserStatement;
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;
@@ -110,6 +109,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.Nu
import
org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.StringLiteralValue;
import
org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLCreateUserStatement;
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 java.util.stream.Collectors;
@@ -712,7 +712,7 @@ public final class MySQLDCLStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitRenameUser(final RenameUserContext ctx) {
- return new RenameUserStatement();
+ return new MySQLRenameUserStatement();
}
@Override
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/RenameUserStatement.java
b/parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLRenameUserStatement.java
similarity index 75%
rename from
parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/RenameUserStatement.java
rename to
parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLRenameUserStatement.java
index e9ed064d341..3f62d472ab1 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/RenameUserStatement.java
+++
b/parser/sql/statement/type/mysql/src/main/java/org/apache/shardingsphere/sql/parser/statement/mysql/dcl/MySQLRenameUserStatement.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;
/**
- * Rename user statement.
+ * Rename user statement for MySQL.
*/
-public final class RenameUserStatement extends DCLStatement {
+public final class MySQLRenameUserStatement extends DCLStatement {
}
diff --git
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareChecker.java
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareChecker.java
index 3e7c3eec3cb..71e067d3203 100644
---
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareChecker.java
+++
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareChecker.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dal.An
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dal.SetStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.AlterUserStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DropUserStatement;
-import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.RenameUserStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.AlterTableStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.CreateDatabaseStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.CreateIndexStatement;
@@ -74,6 +73,7 @@ import
org.apache.shardingsphere.sql.parser.statement.mysql.dal.table.MySQLCheck
import
org.apache.shardingsphere.sql.parser.statement.mysql.dal.table.MySQLRepairTableStatement;
import
org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLCreateUserStatement;
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 java.util.Arrays;
@@ -94,7 +94,7 @@ public final class MySQLComStmtPrepareChecker {
ALLOWED_SQL_STATEMENTS.addAll(Arrays.asList(AlterTableStatement.class,
AlterUserStatement.class, AnalyzeTableStatement.class,
MySQLCacheIndexStatement.class, CallStatement.class,
MySQLChangeMasterStatement.class, MySQLChecksumTableStatement.class,
CommitStatement.class,
CreateIndexStatement.class, DropIndexStatement.class,
CreateDatabaseStatement.class, DropDatabaseStatement.class,
- CreateTableStatement.class, DropTableStatement.class,
MySQLCreateUserStatement.class, RenameUserStatement.class,
DropUserStatement.class,
+ CreateTableStatement.class, DropTableStatement.class,
MySQLCreateUserStatement.class, MySQLRenameUserStatement.class,
DropUserStatement.class,
CreateViewStatement.class, DropViewStatement.class,
DeleteStatement.class, DoStatement.class, MySQLFlushStatement.class,
MySQLGrantStatement.class, InsertStatement.class,
MySQLInstallPluginStatement.class, MySQLKillStatement.class,
MySQLLoadIndexInfoStatement.class,
MySQLOptimizeTableStatement.class, RenameTableStatement.class,
MySQLRepairTableStatement.class, MySQLResetStatement.class,
diff --git
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareCheckerTest.java
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareCheckerTest.java
index 393ff1e82dd..b82a6256cdd 100644
---
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareCheckerTest.java
+++
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareCheckerTest.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dal.An
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dal.SetStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.AlterUserStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DropUserStatement;
-import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.RenameUserStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.AlterTableStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.CreateDatabaseStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.CreateIndexStatement;
@@ -72,6 +71,7 @@ import
org.apache.shardingsphere.sql.parser.statement.mysql.dal.table.MySQLCheck
import
org.apache.shardingsphere.sql.parser.statement.mysql.dal.table.MySQLRepairTableStatement;
import
org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLCreateUserStatement;
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.junit.jupiter.api.Test;
@@ -89,7 +89,7 @@ class MySQLComStmtPrepareCheckerTest {
mock(AlterTableStatement.class),
mock(AlterUserStatement.class), mock(AnalyzeTableStatement.class),
mock(MySQLCacheIndexStatement.class),
mock(CallStatement.class),
mock(MySQLChangeMasterStatement.class),
mock(MySQLChecksumTableStatement.class), mock(CommitStatement.class),
mock(CreateIndexStatement.class),
mock(DropIndexStatement.class), mock(CreateDatabaseStatement.class),
mock(DropDatabaseStatement.class), mock(CreateTableStatement.class),
- mock(DropTableStatement.class),
mock(MySQLCreateUserStatement.class), mock(RenameUserStatement.class),
mock(DropUserStatement.class),
+ mock(DropTableStatement.class),
mock(MySQLCreateUserStatement.class), mock(MySQLRenameUserStatement.class),
mock(DropUserStatement.class),
mock(CreateViewStatement.class),
mock(DropViewStatement.class), mock(DeleteStatement.class),
mock(DoStatement.class), mock(MySQLFlushStatement.class),
mock(MySQLGrantStatement.class), mock(InsertStatement.class),
mock(MySQLInstallPluginStatement.class), mock(MySQLKillStatement.class),
mock(MySQLLoadIndexInfoStatement.class),
mock(MySQLOptimizeTableStatement.class), mock(RenameTableStatement.class),
mock(MySQLRepairTableStatement.class),
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 e8925c85eeb..79ad7d2ce4b 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,11 +27,11 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DC
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.GrantStatement;
-import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.RenameUserStatement;
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.postgresql.dcl.PostgreSQLReassignOwnedStatement;
import
org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerAlterLoginStatement;
import
org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerCreateLoginStatement;
@@ -101,8 +101,8 @@ public final class DCLStatementAssert {
AlterUserStatementAssert.assertIs(assertContext,
(AlterUserStatement) actual, (AlterUserStatementTestCase) expected);
} else if (actual instanceof DropUserStatement) {
DropUserStatementAssert.assertIs(assertContext,
(DropUserStatement) actual, (DropUserStatementTestCase) expected);
- } else if (actual instanceof RenameUserStatement) {
- RenameUserStatementAssert.assertIs(assertContext,
(RenameUserStatement) actual, (RenameUserStatementTestCase) expected);
+ } else if (actual instanceof MySQLRenameUserStatement) {
+ RenameUserStatementAssert.assertIs(assertContext,
(MySQLRenameUserStatement) actual, (RenameUserStatementTestCase) expected);
} else if (actual instanceof SQLServerDenyUserStatement) {
DenyUserStatementAssert.assertIs(assertContext,
(SQLServerDenyUserStatement) actual, (DenyUserStatementTestCase) expected);
} else if (actual instanceof SQLServerCreateLoginStatement) {
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/RenameUserStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/RenameUserStatementAssert.java
index 7b2e04c5010..5ddd9a113d5 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/RenameUserStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dcl/impl/RenameUserStatementAssert.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.RenameUserStatement;
+import
org.apache.shardingsphere.sql.parser.statement.mysql.dcl.MySQLRenameUserStatement;
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.RenameUserStatementTestCase;
@@ -36,6 +36,6 @@ public final class RenameUserStatementAssert {
* @param actual actual rename user statement
* @param expected expected rename user statement test case
*/
- public static void assertIs(final SQLCaseAssertContext assertContext,
final RenameUserStatement actual, final RenameUserStatementTestCase expected) {
+ public static void assertIs(final SQLCaseAssertContext assertContext,
final MySQLRenameUserStatement actual, final RenameUserStatementTestCase
expected) {
}
}
