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

Fix HQLTest issue and javadoc aggregation

This commit is contained in:
Christian Beikov 2022-11-29 01:43:32 +01:00
parent 1f9a6f43f1
commit a81f9d3e2d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4436,8 +4436,13 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
? pluralAttributeMapping.getIndexDescriptor() ? pluralAttributeMapping.getIndexDescriptor()
: pluralAttributeMapping.getElementDescriptor(); : pluralAttributeMapping.getElementDescriptor();
final ModelPart modelPart; final ModelPart modelPart;
if ( collectionPart instanceof EntityAssociationMapping ) { if ( collectionPart instanceof OneToManyCollectionPart ) {
modelPart = ( (EntityAssociationMapping) collectionPart ).getKeyTargetMatchPart(); final OneToManyCollectionPart toManyPart = (OneToManyCollectionPart) collectionPart;
modelPart = toManyPart.getAssociatedEntityMappingType().getIdentifierMapping();
// modelPart = pluralAttributeMapping.getKeyDescriptor().getTargetPart();
}
else if ( collectionPart instanceof ManyToManyCollectionPart ) {
modelPart = ( (ManyToManyCollectionPart) collectionPart ).getKeyTargetMatchPart();
} }
else { else {
modelPart = collectionPart; modelPart = collectionPart;

1
release/release.gradle
View File

@ -145,6 +145,7 @@ dependencies {
javadocClasspath libs.jackson javadocClasspath libs.jackson
javadocClasspath gradleApi() javadocClasspath gradleApi()
javadocClasspath libs.jacksonXml javadocClasspath libs.jacksonXml
javadocClasspath dbLibs.oracle
} }