Skip to content

HHH-19681 - Ensure plural types are resolved with the correct array SQL type #11016

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
Sep 26, 2025
Merged

HHH-19681 - Ensure plural types are resolved with the correct array SQL type #11016

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
49 changes: 46 additions & 3 deletions hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.CollectionHelper;
import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
import org.hibernate.type.descriptor.java.BasicPluralJavaType;
import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
import org.hibernate.type.descriptor.java.JavaType;
import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
import org.hibernate.type.descriptor.jdbc.DelegatingJdbcTypeIndicators;
import org.hibernate.type.descriptor.jdbc.JdbcType;
import org.hibernate.type.internal.BasicTypeImpl;
import org.hibernate.type.internal.ConvertedBasicTypeImpl;
Expand Down Expand Up @@ -162,12 +164,53 @@ private <J> BasicType<J> resolvedType(JavaType<J> javaType, JdbcType jdbcType) {

private <E> BasicType<?> resolvedType(ArrayJdbcType arrayType, BasicPluralJavaType<E> castPluralJavaType) {
final BasicType<E> elementType = resolve( castPluralJavaType.getElementJavaType(), arrayType.getElementJdbcType() );
final var indicators = typeConfiguration.getCurrentBaseSqlTypeIndicators();
final BasicType<?> resolvedType = castPluralJavaType.resolveType(
typeConfiguration,
typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect(),
indicators.getDialect(),
elementType,
null,
typeConfiguration.getCurrentBaseSqlTypeIndicators()
new ColumnTypeInformation() {
@Override
public Boolean getNullable() {
return null;
}

@Override
public int getTypeCode() {
return arrayType.getDefaultSqlTypeCode();
}

@Override
public String getTypeName() {
return null;
}

@Override
public int getColumnSize() {
return 0;
}

@Override
public int getDecimalDigits() {
return 0;
}
},
new DelegatingJdbcTypeIndicators( indicators ) {
@Override
public Integer getExplicitJdbcTypeCode() {
return arrayType.getDefaultSqlTypeCode();
}

@Override
public int getPreferredSqlTypeCodeForArray() {
return arrayType.getDefaultSqlTypeCode();
}

@Override
public int getPreferredSqlTypeCodeForArray(int elementSqlTypeCode) {
return arrayType.getDefaultSqlTypeCode();
}
}
);
if ( resolvedType instanceof BasicPluralType<?,?> ) {
register( resolvedType );
Expand Down