HHH-19792 Wrong query generated when an EmbeddedId is used in a WHERE clause using the IN operator and NativeParameterMarkerStrategy

Author: dreab8

hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java

@@ -475,6 +475,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
 	private final QueryOptions queryOptions;
 	private final LoadQueryInfluencers loadQueryInfluencers;
 
+	private int jdbcParamsBySqmParamParameterId = 0;
 	private final Map<SqmParameter<?>, List<List<JdbcParameter>>> jdbcParamsBySqmParam = new IdentityHashMap<>();
 	private final JdbcParameters jdbcParameters = new JdbcParametersImpl();
 	private final DomainParameterXref domainParameterXref;
@@ -5830,6 +5831,7 @@ protected Expression consumeSqmParameter(
 		);
 
 		this.jdbcParameters.addParameters( jdbcParametersForSqm );
+		jdbcParamsBySqmParamParameterId += jdbcParametersForSqm.size();
 		this.jdbcParamsBySqmParam
 				.computeIfAbsent( sqmParameter, k -> new ArrayList<>( 1 ) )
 				.add( jdbcParametersForSqm );
@@ -6200,12 +6202,12 @@ private void resolveSqmParameter(
 			BiConsumer<Integer,JdbcParameter> jdbcParameterConsumer) {
 		sqmParameterMappingModelTypes.put( expression, valueMapping );
 		final List<List<JdbcParameter>> jdbcParams = jdbcParamsBySqmParam.get( expression );
-		final int parameterId = jdbcParams == null ? jdbcParamsBySqmParam.size()
+		final int parameterId = jdbcParams == null ? jdbcParamsBySqmParamParameterId
 				: NullnessUtil.castNonNull( jdbcParams.get( 0 ).get( 0 ).getParameterId() );
 		final Bindable bindable = bindable( valueMapping );
 		if ( bindable instanceof SelectableMappings selectableMappings ) {
 			selectableMappings.forEachSelectable(
-					(index, selectableMapping) -> jdbcParameterConsumer.accept( index, new SqlTypedMappingJdbcParameter( selectableMapping, parameterId ) )
+					(index, selectableMapping) -> jdbcParameterConsumer.accept( index, new SqlTypedMappingJdbcParameter( selectableMapping, parameterId + index ) )
 			);
 		}
 		else if ( bindable instanceof SelectableMapping selectableMapping ) {
@@ -6221,7 +6223,7 @@ else if ( bindable instanceof SelectableMapping selectableMapping ) {
 				bindable.forEachJdbcType(
 						(index, jdbcMapping) -> jdbcParameterConsumer.accept(
 								index,
-								new JdbcParameterImpl( jdbcMapping, parameterId )
+								new JdbcParameterImpl( jdbcMapping, parameterId + index )
 						)
 				);
 			}