Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15498 Delete Query fails to determine the ValueMapping for SqmParameter

This commit is contained in:
Andrea Boriero 2022-09-13 16:08:02 +02:00 committed by Andrea Boriero
parent c2fab87fed
commit 1237977c5c
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5181,13 +5181,21 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
if ( paramSqmType instanceof SqmPathSource<?> || paramSqmType instanceof BasicDomainType<?> ) {
// Try to infer the value mapping since the other side apparently is a path source
final MappingModelExpressible<?> inferredValueMapping = getInferredValueMapping();
if ( inferredValueMapping != null ) {
return resolveInferredValueMappingForParameter( inferredValueMapping );
final MappingModelExpressible<?> inferredMapping = resolveInferredType();
if ( inferredMapping != null ) {
if ( inferredMapping instanceof PluralAttributeMapping ) {
return resolveInferredValueMappingForParameter( ( (PluralAttributeMapping) inferredMapping ).getElementDescriptor() );
}
else if ( !( inferredMapping instanceof JavaObjectType ) ) {
// Do not report back the "object type" as inferred type and instead try to rely on the paramSqmType.getExpressibleJavaType()
return resolveInferredValueMappingForParameter( inferredMapping );
}
}
final Class<?> parameterJavaType = paramSqmType.getExpressibleJavaType().getJavaTypeClass();
final BasicType<?> basicTypeForJavaType = getTypeConfiguration().getBasicTypeForJavaType(
paramSqmType.getExpressibleJavaType().getJavaTypeClass()
parameterJavaType
);
if ( basicTypeForJavaType == null ) {
@ -5200,11 +5208,15 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
return resolveEntityPersister( (EntityDomainType<?>) type );
}
}
else if ( parameterJavaType.isEnum() ) {
//inferredMapping is JavaObjectType and we cannot deduct the t
if ( inferredMapping != null ) {
return inferredMapping;
}
}
}
return basicTypeForJavaType;
}
throw new ConversionException( "Could not determine ValueMapping for SqmParameter: " + sqmParameter );
}
@ -6681,7 +6693,7 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
@Override
public NullnessPredicate visitIsNullPredicate(SqmNullnessPredicate predicate) {
return new NullnessPredicate(
(Expression) predicate.getExpression().accept( this ),
(Expression) visitWithInferredType( predicate.getExpression(), () -> basicType( Object.class )),
predicate.isNegated(),
getBooleanType()
);