Skip to content

HHH-16991 Fix array based id restriction with EnhanceUserType #11304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2025
+326 −34
Merged

HHH-16991 Fix array based id restriction with EnhanceUserType #11304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 12 additions & 31 deletions ...core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,20 +102,22 @@ public CollectionBatchLoaderArrayParam(
.buildSelectTranslator( getSessionFactory(), sqlSelect )
.translate( JdbcParameterBindings.NO_BINDINGS, QueryOptions.NONE );
}

@Override
public PersistentCollection<?> load(Object keyBeingLoaded, SharedSessionContractImplementor session) {
final var keyDescriptor = getLoadable().getKeyDescriptor();
if ( keyDescriptor.isEmbedded() ) {
if ( keyDescriptor.isEmbedded()
|| keyDescriptor.getKeyPart().getSingleJdbcMapping().getValueConverter() != null ) {
assert keyDescriptor.getJdbcTypeCount() == 1;
return loadEmbeddable( keyBeingLoaded, session, keyDescriptor );
return loadWithConversion( keyBeingLoaded, session, keyDescriptor );
}
else {
return super.load( keyBeingLoaded, session );
}
}

@AllowReflection
private PersistentCollection<?> loadEmbeddable(
private PersistentCollection<?> loadWithConversion(
Object keyBeingLoaded,
SharedSessionContractImplementor session,
ForeignKeyDescriptor keyDescriptor) {
Expand All @@ -126,7 +128,7 @@ private PersistentCollection<?> loadEmbeddable(

final int length = getDomainBatchSize();
final Object[] keysToInitialize = new Object[length];
final Object[] embeddedKeys = new Object[length];
final Object[] domainKeys = new Object[length];
session.getPersistenceContextInternal().getBatchFetchQueue()
.collectBatchLoadableCollectionKeys(
length,
Expand All @@ -135,7 +137,7 @@ private PersistentCollection<?> loadEmbeddable(
key,
(i, value, jdbcMapping) -> {
keysToInitialize[index] = value;
embeddedKeys[index] = key;
domainKeys[index] = key;
},
session
)
Expand All @@ -152,7 +154,7 @@ private PersistentCollection<?> loadEmbeddable(

initializeKeys( keyBeingLoaded, keys, session );

for ( Object initializedKey : embeddedKeys ) {
for ( Object initializedKey : domainKeys ) {
if ( initializedKey != null ) {
finishInitializingKey( initializedKey, session );
}
Expand All @@ -175,7 +177,7 @@ void initializeKeys(Object key, Object[] keysToInitialize, SharedSessionContract
assert jdbcSelectOperation != null;
assert jdbcParameter != null;

final var jdbcParameterBindings = new JdbcParameterBindingsImpl(1);
final var jdbcParameterBindings = new JdbcParameterBindingsImpl( 1 );
jdbcParameterBindings.addBinding(
jdbcParameter,
new JdbcParameterBindingImpl( arraySqlTypedMapping.getJdbcMapping(), keysToInitialize )
Expand Down Expand Up @@ -206,31 +208,10 @@ void finishInitializingKeys(Object[] keys, SharedSessionContractImplementor sess
}

@Override
@AllowReflection
Object[] resolveKeysToInitialize(Object keyBeingLoaded, SharedSessionContractImplementor session) {
final var keyDescriptor = getLoadable().getKeyDescriptor();
if( keyDescriptor.isEmbedded()){
assert keyDescriptor.getJdbcTypeCount() == 1;
final int length = getDomainBatchSize();
final var keysToInitialize = new Object[length];
session.getPersistenceContextInternal().getBatchFetchQueue()
.collectBatchLoadableCollectionKeys(
length,
(index, key) ->
keyDescriptor.forEachJdbcValue(
key,
(i, value, jdbcMapping) -> {
keysToInitialize[index] = value;
},
session
)
,
keyBeingLoaded,
getLoadable()
);
// now trim down the array to the number of keys we found
return trimIdBatch( length, keysToInitialize );
}
assert !getLoadable().getKeyDescriptor().isEmbedded()
&& getLoadable().getKeyDescriptor().getKeyPart().getSingleJdbcMapping().getValueConverter() == null
: "Should use loadWithConversion() instead";
return super.resolveKeysToInitialize( keyBeingLoaded, session );
}
}
13 changes: 10 additions & 3 deletions hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

import org.hibernate.metamodel.mapping.JdbcMapping;
import org.hibernate.sql.exec.spi.JdbcParameterBinding;
import org.hibernate.type.descriptor.java.BasicPluralJavaType;

import java.util.Arrays;
import java.util.Locale;

/**
* @author Andrea Boriero
Expand All @@ -16,9 +20,12 @@ public class JdbcParameterBindingImpl implements JdbcParameterBinding {
private final Object bindValue;

public JdbcParameterBindingImpl(JdbcMapping jdbcMapping, Object bindValue) {
// assert bindValue == null || jdbcMapping == null || jdbcMapping.getJdbcJavaType().isInstance( bindValue )
// : String.format( Locale.ROOT, "Unexpected value type (expected : %s) : %s (%s)",
// jdbcMapping.getJdbcJavaType().getJavaTypeClass().getName(), bindValue, bindValue.getClass().getName() );
assert bindValue == null || jdbcMapping == null || jdbcMapping.getJdbcJavaType().isInstance( bindValue )
|| jdbcMapping.getJdbcJavaType() instanceof BasicPluralJavaType<?> pluralJavaType
&& bindValue instanceof Object[] objects
&& Arrays.stream( objects ).allMatch( pluralJavaType.getElementJavaType()::isInstance )
: String.format( Locale.ROOT, "Unexpected value type (expected : %s) : %s (%s)",
jdbcMapping.getJdbcJavaType().getJavaTypeClass().getName(), bindValue, bindValue.getClass().getName() );

this.jdbcMapping = jdbcMapping;
this.bindValue = bindValue;
Expand Down
Loading
Loading