(shardingsphere) branch master updated: Merge AlterUserStatement and SQLServerAlterUserStatement (#35862)

[zh...@apache.org]

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 d23c68b94c6 Merge AlterUserStatement and SQLServerAlterUserStatement (#35862)
d23c68b94c6 is described below

commit d23c68b94c694f5e96fdd0d3969867f1adc701f2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Jul 2 23:16:45 2025 +0800

    Merge AlterUserStatement and SQLServerAlterUserStatement (#35862)
    
    * Code format for PomTemplateTest
    
    * Merge AlterUserStatement and SQLServerAlterUserStatement
---
 .../src/test/java/PomTemplateTest.java             | 12 ++++----
 .../statement/type/DorisDCLStatementVisitor.java   |  2 +-
 .../statement/type/MySQLDCLStatementVisitor.java   |  2 +-
 .../type/OpenGaussDCLStatementVisitor.java         |  2 +-
 .../statement/type/OracleDCLStatementVisitor.java  |  2 +-
 .../type/PostgreSQLDCLStatementVisitor.java        |  2 +-
 .../type/SQLServerDCLStatementVisitor.java         |  4 +--
 .../statement/type/dcl/AlterUserStatement.java     | 10 ++++++-
 .../sqlserver/dcl/SQLServerAlterUserStatement.java | 33 ----------------------
 9 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/examples/shardingsphere-jdbc-example-generator/src/test/java/PomTemplateTest.java b/examples/shardingsphere-jdbc-example-generator/src/test/java/PomTemplateTest.java
index 2290263ff8e..b8b150a8deb 100644
--- a/examples/shardingsphere-jdbc-example-generator/src/test/java/PomTemplateTest.java
+++ b/examples/shardingsphere-jdbc-example-generator/src/test/java/PomTemplateTest.java
@@ -34,18 +34,18 @@ import static org.hamcrest.Matchers.not;
  * Test case for pom template generation.
  */
 public final class PomTemplateTest {
-
+    
     private Configuration templateConfig;
-
+    
     @BeforeEach
     public void setUp() {
         templateConfig = new Configuration(Configuration.VERSION_2_3_31);
         templateConfig.setClassLoaderForTemplateLoading(getClass().getClassLoader(), "/template");
     }
-
+    
     @Test
     public void assertStandaloneJdbcRepository() throws IOException, TemplateException {
-        Map<String, Object> dataModel = new HashMap<>();
+        Map<String, Object> dataModel = new HashMap<>(6, 1F);
         dataModel.put("mode", "standalone");
         dataModel.put("repository", "JDBC");
         dataModel.put("feature", "sharding");
@@ -58,10 +58,10 @@ public final class PomTemplateTest {
         String result = writer.toString();
         assertThat(result, containsString("shardingsphere-standalone-mode-repository-jdbc"));
     }
-
+    
     @Test
     public void assertNoStandaloneJdbcRepository() throws IOException, TemplateException {
-        Map<String, Object> dataModel = new HashMap<>();
+        Map<String, Object> dataModel = new HashMap<>(6, 1F);
         dataModel.put("mode", "standalone");
         dataModel.put("repository", "File");
         dataModel.put("feature", "sharding");
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 14f4a9d1b41..9cabbddc1c8 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
@@ -710,7 +710,7 @@ public final class DorisDCLStatementVisitor extends DorisStatementVisitor implem
     
     @Override
     public ASTNode visitAlterUser(final AlterUserContext ctx) {
-        return new AlterUserStatement();
+        return new AlterUserStatement(null);
     }
     
     @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 36a32cc14b5..0b9d3a0e949 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
@@ -707,7 +707,7 @@ public final class MySQLDCLStatementVisitor extends MySQLStatementVisitor implem
     
     @Override
     public ASTNode visitAlterUser(final AlterUserContext ctx) {
-        return new AlterUserStatement();
+        return new AlterUserStatement(null);
     }
     
     @Override
diff --git a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDCLStatementVisitor.java b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDCLStatementVisitor.java
index ef60988d395..cad69242bbb 100644
--- a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDCLStatementVisitor.java
+++ b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDCLStatementVisitor.java
@@ -87,7 +87,7 @@ public final class OpenGaussDCLStatementVisitor extends OpenGaussStatementVisito
     
     @Override
     public ASTNode visitAlterUser(final AlterUserContext ctx) {
-        return new AlterUserStatement();
+        return new AlterUserStatement(null);
     }
     
     @Override
diff --git a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDCLStatementVisitor.java b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDCLStatementVisitor.java
index 2ac05441001..4ec787f8f9c 100644
--- a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDCLStatementVisitor.java
+++ b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDCLStatementVisitor.java
@@ -77,7 +77,7 @@ public final class OracleDCLStatementVisitor extends OracleStatementVisitor impl
     
     @Override
     public ASTNode visitAlterUser(final AlterUserContext ctx) {
-        return new AlterUserStatement();
+        return new AlterUserStatement(null);
     }
     
     @Override
diff --git a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDCLStatementVisitor.java b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDCLStatementVisitor.java
index 2613de6467e..ad6b1187112 100644
--- a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDCLStatementVisitor.java
+++ b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDCLStatementVisitor.java
@@ -91,7 +91,7 @@ public final class PostgreSQLDCLStatementVisitor extends PostgreSQLStatementVisi
     
     @Override
     public ASTNode visitAlterUser(final AlterUserContext ctx) {
-        return new AlterUserStatement();
+        return new AlterUserStatement(null);
     }
     
     @Override
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 467273e41bf..17ad1447b11 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
@@ -51,6 +51,7 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.Owner
 import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.AlterRoleStatement;
+import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.AlterUserStatement;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.CreateRoleStatement;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.CreateUserStatement;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.DropRoleStatement;
@@ -59,7 +60,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.value.collection.Coll
 import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
 import org.apache.shardingsphere.sql.parser.statement.core.value.literal.impl.StringLiteralValue;
 import org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerAlterLoginStatement;
-import org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerAlterUserStatement;
 import org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerCreateLoginStatement;
 import org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerDenyUserStatement;
 import org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl.SQLServerDropLoginStatement;
@@ -175,7 +175,7 @@ public final class SQLServerDCLStatementVisitor extends SQLServerStatementVisito
     
     @Override
     public ASTNode visitAlterUser(final AlterUserContext ctx) {
-        return new SQLServerAlterUserStatement((UserSegment) visit(ctx.userName()));
+        return new AlterUserStatement((UserSegment) visit(ctx.userName()));
     }
     
     @Override
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/AlterUserStatement.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/AlterUserStatement.java
index cce07ae5ea8..ff99ea09da2 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/AlterUserStatement.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/dcl/AlterUserStatement.java
@@ -17,8 +17,16 @@
 
 package org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.sql.parser.statement.core.segment.dcl.UserSegment;
+
 /**
  * Alter user statement.
  */
-public class AlterUserStatement extends DCLStatement {
+@RequiredArgsConstructor
+@Getter
+public final class AlterUserStatement extends DCLStatement {
+    
+    private final UserSegment user;
 }
diff --git a/parser/sql/statement/type/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/statement/sqlserver/dcl/SQLServerAlterUserStatement.java b/parser/sql/statement/type/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/statement/sqlserver/dcl/SQLServerAlterUserStatement.java
deleted file mode 100644
index a22e979b498..00000000000
--- a/parser/sql/statement/type/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/statement/sqlserver/dcl/SQLServerAlterUserStatement.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.sql.parser.statement.sqlserver.dcl;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.sql.parser.statement.core.segment.dcl.UserSegment;
-import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dcl.AlterUserStatement;
-
-/**
- * Alter user statement for SQLServer.
- */
-@RequiredArgsConstructor
-@Getter
-public final class SQLServerAlterUserStatement extends AlterUserStatement {
-    
-    private final UserSegment user;
-}