fix

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/jdbc/env/internal/ReactiveMutationExecutor.java

@@ -58,7 +58,7 @@ default CompletionStage<GeneratedValues> executeReactive(
 			TableInclusionChecker inclusionChecker,
 			OperationResultChecker resultChecker,
 			SharedSessionContractImplementor session) {
-		return executeReactive( modelReference, valuesAnalysis, inclusionChecker, resultChecker, session, true );
+		return executeReactive( modelReference, valuesAnalysis, inclusionChecker, resultChecker, session, true, null );
 	}
 
 	default CompletionStage<GeneratedValues> executeReactive(
@@ -67,8 +67,9 @@ default CompletionStage<GeneratedValues> executeReactive(
 			TableInclusionChecker inclusionChecker,
 			OperationResultChecker resultChecker,
 			SharedSessionContractImplementor session,
-			boolean isIdentityInsert) {
-		return performReactiveNonBatchedOperations( modelReference, valuesAnalysis, inclusionChecker, resultChecker, session, isIdentityInsert )
+			boolean isIdentityInsert,
+			String[] identifierColumnsNames) {
+		return performReactiveNonBatchedOperations( modelReference, valuesAnalysis, inclusionChecker, resultChecker, session, isIdentityInsert, identifierColumnsNames )
 				.thenCompose( generatedValues -> performReactiveSelfExecutingOperations( valuesAnalysis, inclusionChecker, session )
 									  .thenCompose( v -> performReactiveBatchedOperations( valuesAnalysis, inclusionChecker, resultChecker, session ) )
 									  .thenApply( v -> generatedValues )
@@ -81,7 +82,8 @@ default CompletionStage<GeneratedValues> performReactiveNonBatchedOperations(
 			TableInclusionChecker inclusionChecker,
 			OperationResultChecker resultChecker,
 			SharedSessionContractImplementor session,
-			boolean isIdentityInsert) {
+			boolean isIdentityInsert,
+			String[] identifierColumnsNames) {
 		return nullFuture();
 	}
 
@@ -160,7 +162,8 @@ default CompletionStage<Void> performReactiveNonBatchedMutation(
 			JdbcValueBindings valueBindings,
 			TableInclusionChecker inclusionChecker,
 			OperationResultChecker resultChecker,
-			SharedSessionContractImplementor session) {
+			SharedSessionContractImplementor session,
+			String[] identifierColumnsNames) {
 		if ( statementDetails == null ) {
 			return nullFuture();
 		}
@@ -195,7 +198,10 @@ default CompletionStage<Void> performReactiveNonBatchedMutation(
 
 		Dialect dialect = session.getJdbcServices().getDialect();
 		ReactiveConnection reactiveConnection = ( (ReactiveConnectionSupplier) session ).getReactiveConnection();
-		String sqlString = createInsert( statementDetails.getSqlString(), "id", dialect );
+		String sqlString = statementDetails.getSqlString();
+		if ( identifierColumnsNames != null ) {
+			sqlString = createInsert( statementDetails.getSqlString(), identifierColumnsNames[0], dialect );
+		}
 		return reactiveConnection
 				.update( sqlString, params )
 				.thenCompose( affectedRowCount -> {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/jdbc/mutation/internal/ReactiveMutationExecutorSingleNonBatched.java

@@ -45,7 +45,8 @@ public CompletionStage<GeneratedValues> performReactiveNonBatchedOperations(
 			TableInclusionChecker inclusionChecker,
 			OperationResultChecker resultChecker,
 			SharedSessionContractImplementor session,
-			boolean isIdentityInsert) {
+			boolean isIdentityInsert,
+			String[] identifierColumnsNames) {
 		PreparedStatementDetails singleStatementDetails = getStatementGroup().getSingleStatementDetails();
 		if ( generatedValuesDelegate != null && !isRegularInsertWithMariaDb( session, isIdentityInsert ) ) {
 			return generatedValuesDelegate.reactivePerformMutation(
@@ -61,7 +62,8 @@ public CompletionStage<GeneratedValues> performReactiveNonBatchedOperations(
 				getJdbcValueBindings(),
 				inclusionChecker,
 				resultChecker,
-				session
+				session,
+				identifierColumnsNames
 		).thenCompose( CompletionStages::nullFuture );
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/jdbc/mutation/internal/ReactiveMutationExecutorStandard.java

@@ -110,7 +110,8 @@ public CompletionStage<GeneratedValues> performReactiveNonBatchedOperations(
 			TableInclusionChecker inclusionChecker,
 			OperationResultChecker resultChecker,
 			SharedSessionContractImplementor session,
-			boolean isIndentityInsert) {
+			boolean isIndentityInsert,
+			String[] identifiersColumnsNames) {
 
 		if ( getNonBatchedStatementGroup() == null || getNonBatchedStatementGroup().getNumberOfStatements() <= 0 ) {
 			return nullFuture();
@@ -186,7 +187,7 @@ public void add(String tableName, PreparedStatementDetails statementDetails) {
 			if ( requiresCheck ) {
 				loop = loop.thenCompose( v -> !statementDetails
 						.getMutatingTableDetails().isIdentifierTable()
-						? performReactiveNonBatchedMutation( statementDetails, id, jdbcValueBindings, inclusionChecker, resultChecker, session )
+						? performReactiveNonBatchedMutation( statementDetails, id, jdbcValueBindings, inclusionChecker, resultChecker, session, null )
 						: voidFuture()
 				);
 			}
@@ -197,7 +198,8 @@ public void add(String tableName, PreparedStatementDetails statementDetails) {
 						jdbcValueBindings,
 						inclusionChecker,
 						resultChecker,
-						session
+						session,
+						null
 				) );
 			}
 		}
@@ -213,7 +215,8 @@ public CompletionStage<Void> performReactiveNonBatchedMutation(
 			JdbcValueBindings valueBindings,
 			TableInclusionChecker inclusionChecker,
 			OperationResultChecker resultChecker,
-			SharedSessionContractImplementor session) {
+			SharedSessionContractImplementor session,
+			String[] identifierColumnsNames) {
 		if ( statementDetails == null ) {
 			return voidFuture();
 		}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveDeleteCoordinator.java

@@ -142,6 +142,7 @@ protected void doStaticDelete(Object entity, Object id, Object rowId, Object[] l
 		final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
 		bindPartitionColumnValueBindings( loadedState, session, jdbcValueBindings );
 		applyId( id, rowId, mutationExecutor, getStaticMutationOperationGroup(), session );
+		String[] identifierColumnNames = entityPersister().getIdentifierColumnNames();
 		mutationExecutor.executeReactive(
 						entity,
 						null,

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java

@@ -232,7 +232,8 @@ protected CompletionStage<GeneratedValues> doDynamicInserts(
 									return true;
 								},
 								session,
-								isIdentityInsert
+								isIdentityInsert,
+								entityPersister().getIdentifierColumnNames()
 						)
 						.whenComplete( (o, t) -> mutationExecutor.release() ) );
 	}
@@ -252,7 +253,8 @@ protected CompletionStage<GeneratedValues> doStaticInserts(Object id, Object[] v
 							return true;
 						},
 						session,
-						isIdentityInsert
+						isIdentityInsert,
+						entityPersister().getIdentifierColumnNames()
 				) )
 				.whenComplete( (generatedValues, throwable) -> mutationExecutor.release() );
 	}