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 e71e7e6fecc Add DialectAlterTableOption for alter table operations
support (#35291)
e71e7e6fecc is described below
commit e71e7e6fecc3e8bbc75e1bd98371ef01699f451e
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Apr 29 19:11:04 2025 +0800
Add DialectAlterTableOption for alter table operations support (#35291)
* Add DialectAlterTableOption for alter table operations support
* Add DialectAlterTableOption for alter table operations support
---
.../ddl/EncryptAlterTableTokenGenerator.java | 15 +++++-----
.../ddl/EncryptAlterTableTokenGeneratorTest.java | 3 ++
.../database/metadata/DialectDatabaseMetaData.java | 10 +++++++
.../option/altertable/DialectAlterTableOption.java | 33 ++++++++++++++++++++++
.../metadata/database/OracleDatabaseMetaData.java | 6 ++++
.../database/SQLServerDatabaseMetaData.java | 6 ++++
6 files changed, 66 insertions(+), 7 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/ddl/EncryptAlterTableTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/ddl/EncryptAlterTableTokenGenerator.java
index 46496cc5b7a..1f61a7f8746 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/ddl/EncryptAlterTableTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/ddl/EncryptAlterTableTokenGenerator.java
@@ -31,6 +31,8 @@ import
org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.AlterTableStatementContext;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.altertable.DialectAlterTableOption;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.CollectionSQLTokenGenerator;
import org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.SQLToken;
@@ -73,11 +75,9 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
result.addAll(getModifyColumnTokens(encryptTable,
sqlStatementContext.getSqlStatement().getModifyColumnDefinitions()));
result.addAll(getChangeColumnTokens(encryptTable,
sqlStatementContext.getSqlStatement().getChangeColumnDefinitions()));
List<SQLToken> dropColumnTokens = getDropColumnTokens(encryptTable,
sqlStatementContext.getSqlStatement().getDropColumnDefinitions());
- String databaseName = sqlStatementContext.getDatabaseType().getType();
- if ("SQLServer".equals(databaseName)) {
- result.addAll(mergeDropColumnStatement(dropColumnTokens, "", ""));
- } else if ("Oracle".equals(databaseName)) {
- result.addAll(mergeDropColumnStatement(dropColumnTokens, "(",
")"));
+ DialectAlterTableOption alterTableOption = new
DatabaseTypeRegistry(sqlStatementContext.getDatabaseType()).getDialectDatabaseMetaData().getAlterTableOption();
+ if (alterTableOption.isSupportMergeDropColumns()) {
+ result.addAll(mergeDropColumnStatement(dropColumnTokens,
alterTableOption.isContainsParenthesesOnMergeDropColumns()));
} else {
result.addAll(dropColumnTokens);
}
@@ -236,7 +236,7 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
return result;
}
- private Collection<SQLToken> mergeDropColumnStatement(final List<SQLToken>
dropSQLTokens, final String leftJoiner, final String rightJoiner) {
+ private Collection<SQLToken> mergeDropColumnStatement(final List<SQLToken>
dropSQLTokens, final boolean containsParentheses) {
Collection<SQLToken> result = new LinkedList<>();
Collection<String> dropColumns = new LinkedList<>();
int lastStartIndex = -1;
@@ -248,7 +248,8 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
EncryptAlterTableToken encryptAlterTableToken =
(EncryptAlterTableToken) token;
dropColumns.add(encryptAlterTableToken.getColumnName());
if (i == dropSQLTokens.size() - 1) {
- result.add(new
EncryptAlterTableToken(token.getStartIndex(),
encryptAlterTableToken.getStopIndex(), leftJoiner + String.join(",",
dropColumns) + rightJoiner, "DROP COLUMN"));
+ result.add(new
EncryptAlterTableToken(token.getStartIndex(),
encryptAlterTableToken.getStopIndex(),
+ containsParentheses ? String.format("(%s)",
String.join(",", dropColumns)) : String.join(",", dropColumns), "DROP COLUMN"));
}
}
lastStartIndex = ((Substitutable) token).getStartIndex();
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/ddl/EncryptAlterTableTokenGeneratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/ddl/EncryptAlterTableTokenGeneratorTest.java
index 97f4f8f71c7..119e0ad21d2 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/ddl/EncryptAlterTableTokenGeneratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/ddl/EncryptAlterTableTokenGeneratorTest.java
@@ -26,8 +26,10 @@ import
org.apache.shardingsphere.encrypt.rule.column.item.LikeQueryColumnItem;
import org.apache.shardingsphere.encrypt.rule.table.EncryptTable;
import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.AlterTableStatementContext;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.SQLToken;
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.generic.RemoveToken;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.column.ColumnDefinitionSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.column.alter.AddColumnDefinitionSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.column.alter.ChangeColumnDefinitionSegment;
@@ -113,6 +115,7 @@ class EncryptAlterTableTokenGeneratorTest {
private AlterTableStatementContext mockAddColumnStatementContext() {
AlterTableStatementContext result =
mock(AlterTableStatementContext.class, RETURNS_DEEP_STUBS);
+
when(result.getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
when(result.getSqlStatement().getTable().getTableName().getIdentifier().getValue()).thenReturn("t_encrypt");
ColumnDefinitionSegment columnDefinitionSegment = new
ColumnDefinitionSegment(
33, 67, new ColumnSegment(33, 50, new
IdentifierValue("certificate_number")), new DataTypeSegment(), false, false,
"");
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
index 95b3d0f09ef..6995aa1ab9a 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.infra.database.core.metadata.database.metadata
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.altertable.DialectAlterTableOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.column.DialectColumnOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.connection.DialectConnectionOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DefaultDataTypeOption;
@@ -136,4 +137,13 @@ public interface DialectDatabaseMetaData extends
DatabaseTypedSPI {
default DialectJoinOrderOption getJoinOrderOption() {
return new DialectJoinOrderOption(false, false);
}
+
+ /**
+ * Get alter table option.
+ *
+ * @return alter table option
+ */
+ default DialectAlterTableOption getAlterTableOption() {
+ return new DialectAlterTableOption(false, false);
+ }
}
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/altertable/DialectAlterTableOption.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/altertable/DialectAlterTableOption.java
new file mode 100644
index 00000000000..01e362443a1
--- /dev/null
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/altertable/DialectAlterTableOption.java
@@ -0,0 +1,33 @@
+/*
+ * 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.infra.database.core.metadata.database.metadata.option.altertable;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Dialect alter table option.
+ */
+@RequiredArgsConstructor
+@Getter
+public final class DialectAlterTableOption {
+
+ private final boolean isSupportMergeDropColumns;
+
+ private final boolean containsParenthesesOnMergeDropColumns;
+}
diff --git
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
index 7ac09ffb276..350254f7178 100644
---
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
+++
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.infra.database.oracle.metadata.database;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.DialectDatabaseMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.altertable.DialectAlterTableOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.connection.DialectConnectionOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.index.DialectIndexOption;
@@ -68,6 +69,11 @@ public final class OracleDatabaseMetaData implements
DialectDatabaseMetaData {
return new DialectConnectionOption(true, false);
}
+ @Override
+ public DialectAlterTableOption getAlterTableOption() {
+ return new DialectAlterTableOption(true, true);
+ }
+
@Override
public String getDatabaseType() {
return "Oracle";
diff --git
a/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/metadata/database/SQLServerDatabaseMetaData.java
b/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/metadata/database/SQLServerDatabaseMetaData.java
index e43b6331d5f..9981b8582dc 100644
---
a/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/metadata/database/SQLServerDatabaseMetaData.java
+++
b/infra/database/type/sqlserver/src/main/java/org/apache/shardingsphere/infra/database/sqlserver/metadata/database/SQLServerDatabaseMetaData.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.infra.database.sqlserver.metadata.database;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.DialectDatabaseMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.altertable.DialectAlterTableOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DefaultSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
@@ -43,6 +44,11 @@ public final class SQLServerDatabaseMetaData implements
DialectDatabaseMetaData
return new DefaultSchemaOption(false, "dbo");
}
+ @Override
+ public DialectAlterTableOption getAlterTableOption() {
+ return new DialectAlterTableOption(true, false);
+ }
+
@Override
public String getDatabaseType() {
return "SQLServer";
