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 966c4679cca Merge GeneratedKeyColumnProvider and
DialectGeneratedKeyOption (#37058)
966c4679cca is described below
commit 966c4679ccad28153acde4135683986870600d91
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Nov 9 22:07:24 2025 +0800
Merge GeneratedKeyColumnProvider and DialectGeneratedKeyOption (#37058)
* Merge GeneratedKeyColumnProvider and DialectGeneratedKeyOption
* Merge GeneratedKeyColumnProvider and DialectGeneratedKeyOption
---
.../core/keygen/GeneratedKeyColumnProvider.java | 35 ---------------------
.../option/keygen/DialectGeneratedKeyOption.java | 17 ++++++++++
.../keygen/MySQLGeneratedKeyColumnProvider.java | 36 ----------------------
.../metadata/database/MySQLDatabaseMetaData.java | 2 +-
...onnector.core.keygen.GeneratedKeyColumnProvider | 18 -----------
.../statement/ShardingSpherePreparedStatement.java | 8 ++---
.../core/statement/ShardingSphereStatement.java | 8 ++---
7 files changed, 26 insertions(+), 98 deletions(-)
diff --git
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/keygen/GeneratedKeyColumnProvider.java
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/keygen/GeneratedKeyColumnProvider.java
deleted file mode 100644
index b14caabfa56..00000000000
---
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/keygen/GeneratedKeyColumnProvider.java
+++ /dev/null
@@ -1,35 +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.database.connector.core.keygen;
-
-import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPI;
-import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
-
-/**
- * Generated key column provider.
- */
-@SingletonSPI
-public interface GeneratedKeyColumnProvider extends DatabaseTypedSPI {
-
- /**
- * Get generated key column.
- *
- * @return generated key column
- */
- String getColumnName();
-}
diff --git
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/database/metadata/option/keygen/DialectGeneratedKeyOption.java
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/database/metadata/option/keygen/DialectGeneratedKeyOption.java
index e90a51984e8..722d3d7ff0a 100644
---
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/database/metadata/option/keygen/DialectGeneratedKeyOption.java
+++
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/database/metadata/option/keygen/DialectGeneratedKeyOption.java
@@ -20,6 +20,8 @@ package
org.apache.shardingsphere.database.connector.core.metadata.database.meta
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import java.util.Optional;
+
/**
* Dialect generated key option.
*/
@@ -28,4 +30,19 @@ import lombok.RequiredArgsConstructor;
public final class DialectGeneratedKeyOption {
private final boolean isSupportReturnGeneratedKeys;
+
+ private final String columnName;
+
+ public DialectGeneratedKeyOption(final boolean
isSupportReturnGeneratedKeys) {
+ this(isSupportReturnGeneratedKeys, null);
+ }
+
+ /**
+ * Get column name.
+ *
+ * @return column name
+ */
+ public Optional<String> getColumnName() {
+ return Optional.ofNullable(columnName);
+ }
}
diff --git
a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/keygen/MySQLGeneratedKeyColumnProvider.java
b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/keygen/MySQLGeneratedKeyColumnProvider.java
deleted file mode 100644
index 2951c2cbcd0..00000000000
---
a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/keygen/MySQLGeneratedKeyColumnProvider.java
+++ /dev/null
@@ -1,36 +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.database.connector.mysql.keygen;
-
-import
org.apache.shardingsphere.database.connector.core.keygen.GeneratedKeyColumnProvider;
-
-/**
- * Generated key column provider for MySQL.
- */
-public final class MySQLGeneratedKeyColumnProvider implements
GeneratedKeyColumnProvider {
-
- @Override
- public String getColumnName() {
- return "GENERATED_KEY";
- }
-
- @Override
- public String getDatabaseType() {
- return "MySQL";
- }
-}
diff --git
a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/MySQLDatabaseMetaData.java
b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/MySQLDatabaseMetaData.java
index b3653d0c957..01af7c42014 100644
---
a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/MySQLDatabaseMetaData.java
+++
b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/MySQLDatabaseMetaData.java
@@ -81,7 +81,7 @@ public final class MySQLDatabaseMetaData implements
DialectDatabaseMetaData {
@Override
public DialectGeneratedKeyOption getGeneratedKeyOption() {
- return new DialectGeneratedKeyOption(true);
+ return new DialectGeneratedKeyOption(true, "GENERATED_KEY");
}
@Override
diff --git
a/database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.keygen.GeneratedKeyColumnProvider
b/database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.keygen.GeneratedKeyColumnProvider
deleted file mode 100644
index 48e831ed643..00000000000
---
a/database/connector/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.keygen.GeneratedKeyColumnProvider
+++ /dev/null
@@ -1,18 +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.
-#
-
-org.apache.shardingsphere.database.connector.mysql.keygen.MySQLGeneratedKeyColumnProvider
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index bbe803b4f99..1f7ba866731 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.driver.jdbc.core.statement;
import lombok.AccessLevel;
import lombok.Getter;
-import
org.apache.shardingsphere.database.connector.core.keygen.GeneratedKeyColumnProvider;
-import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
+import
org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.keygen.DialectGeneratedKeyOption;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import
org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
import
org.apache.shardingsphere.database.exception.core.SQLExceptionTransformEngine;
import
org.apache.shardingsphere.driver.executor.callback.add.StatementAddCallback;
import
org.apache.shardingsphere.driver.executor.engine.batch.preparedstatement.DriverExecuteBatchExecutor;
@@ -312,8 +312,8 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
}
private String getGeneratedKeysColumnName(final String columnName) {
- return
DatabaseTypedSPILoader.findService(GeneratedKeyColumnProvider.class,
usedDatabase.getProtocolType())
-
.map(GeneratedKeyColumnProvider::getColumnName).orElse(columnName);
+ DialectGeneratedKeyOption generatedKeyOption = new
DatabaseTypeRegistry(usedDatabase.getProtocolType()).getDialectDatabaseMetaData().getGeneratedKeyOption();
+ return generatedKeyOption.getColumnName().orElse(columnName);
}
@Override
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index e9a96a18a15..d936a1df9de 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.driver.jdbc.core.statement;
import lombok.AccessLevel;
import lombok.Getter;
-import
org.apache.shardingsphere.database.connector.core.keygen.GeneratedKeyColumnProvider;
-import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
+import
org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.keygen.DialectGeneratedKeyOption;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import
org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
import
org.apache.shardingsphere.database.exception.core.SQLExceptionTransformEngine;
import
org.apache.shardingsphere.driver.executor.callback.add.StatementAddCallback;
import
org.apache.shardingsphere.driver.executor.callback.execute.StatementExecuteCallback;
@@ -362,8 +362,8 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
}
private String getGeneratedKeysColumnName(final String columnName) {
- return
DatabaseTypedSPILoader.findService(GeneratedKeyColumnProvider.class,
metaData.getDatabase(usedDatabaseName).getProtocolType())
-
.map(GeneratedKeyColumnProvider::getColumnName).orElse(columnName);
+ DialectGeneratedKeyOption generatedKeyOption = new
DatabaseTypeRegistry(metaData.getDatabase(usedDatabaseName).getProtocolType()).getDialectDatabaseMetaData().getGeneratedKeyOption();
+ return generatedKeyOption.getColumnName().orElse(columnName);
}
@Override
