fixup! --wip-- test to use more generic delegates for identity

mbladel · Dec 21, 2023 · f408626 · f408626
1 parent 25c974d
commit f408626
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
@@ -12,6 +12,8 @@
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.dialect.function.CommonFunctionFactory;
+import org.hibernate.dialect.identity.IdentityColumnSupport;
+import org.hibernate.dialect.identity.MariaDBIdentityColumnSupport;
 import org.hibernate.dialect.sequence.MariaDBSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
@@ -253,6 +255,11 @@ public boolean supportsUpdateReturning() {
 		return false;
 	}
 
+	@Override
+	public IdentityColumnSupport getIdentityColumnSupport() {
+		return MariaDBIdentityColumnSupport.INSTANCE;
+	}
+
 	@Override
 	public FunctionalDependencyAnalysisSupport getFunctionalDependencyAnalysisSupport() {
 		return FunctionalDependencyAnalysisSupportImpl.TABLE_GROUP_AND_CONSTANTS;

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/IdentityColumnSupport.java
@@ -55,7 +55,10 @@ public interface IdentityColumnSupport {
 	 *
 	 * @return The insert command with any necessary identity select
 	 * clause attached.
+	 *
+	 * @deprecated Use {@link #appendIdentitySelectToInsert(String, String)} instead.
 	 */
+	@Deprecated( forRemoval = true, since = "6.5" )
 	String appendIdentitySelectToInsert(String insertString);
 
 	/**

diff --git a/...rnate-core/src/main/java/org/hibernate/dialect/identity/MariaDBIdentityColumnSupport.java b/...rnate-core/src/main/java/org/hibernate/dialect/identity/MariaDBIdentityColumnSupport.java
@@ -0,0 +1,19 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package org.hibernate.dialect.identity;
+
+/**
+ * @author Marco Belladelli
+ */
+public class MariaDBIdentityColumnSupport extends MySQLIdentityColumnSupport {
+	public static final MariaDBIdentityColumnSupport INSTANCE = new MariaDBIdentityColumnSupport();
+
+	@Override
+	public String appendIdentitySelectToInsert(String identityColumnName, String insertString) {
+		return insertString + " returning " + identityColumnName;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java
@@ -22,6 +22,7 @@
 import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
 import org.hibernate.generator.values.TableUpdateReturningBuilder;
 import org.hibernate.jdbc.Expectation;
+import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.model.ast.MutatingTableReference;
@@ -112,7 +113,10 @@ public JdbcValuesMappingProducer getGeneratedValuesMappingProducer() {
 
 	@Override
 	public String prepareIdentifierGeneratingInsert(String insertSQL) {
-		return dialect.getIdentityColumnSupport().appendIdentitySelectToInsert( insertSQL );
+		return dialect.getIdentityColumnSupport().appendIdentitySelectToInsert(
+				( (BasicEntityIdentifierMapping) persister.getRootEntityDescriptor().getIdentifierMapping() ).getSelectionExpression(),
+				insertSQL
+		);
 	}
 
 	@Override

diff --git a/...rnate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java b/...rnate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java
@@ -16,6 +16,7 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
 import org.hibernate.persister.entity.EntityPersister;
 
 import static org.hibernate.generator.values.GeneratedValuesHelper.getGeneratedValues;
@@ -37,7 +38,10 @@ public SybaseJConnGetGeneratedKeysDelegate(EntityPersister persister, Dialect di
 
 	@Override
 	public String prepareIdentifierGeneratingInsert(String insertSQL) {
-		return dialect.getIdentityColumnSupport().appendIdentitySelectToInsert( insertSQL );
+		return dialect.getIdentityColumnSupport().appendIdentitySelectToInsert(
+				( (BasicEntityIdentifierMapping) persister.getRootEntityDescriptor().getIdentifierMapping() ).getSelectionExpression(),
+				insertSQL
+		);
 	}
 
 	@Override