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

HHH-17460 - Ongoing JPA 32 work

This commit is contained in:
Steve Ebersole 2024-03-15 11:53:03 -05:00
parent 04b8ea5657
commit c7699b61b5
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
View File

@ -1346,8 +1346,9 @@ public abstract class CollectionBinder {
sqlInsert.getBoolean( "callable" ),
fromResultCheckStyle( sqlInsert.getEnum( "check" ) )
);
if ( sqlInsert.verify() != Expectation.class ) {
collection.setInsertExpectation( getDefaultSupplier( sqlInsert.verify() ) );
final ClassDetails verifier = sqlInsert.getClassDetails( "verify" );
if ( !verifier.getName().equals( Expectation.class.getName() ) ) {
collection.setInsertExpectation( getDefaultSupplier( verifier.toJavaClass() ) );
}
}
@ -1358,8 +1359,9 @@ public abstract class CollectionBinder {
sqlUpdate.getBoolean( "callable" ),
fromResultCheckStyle( sqlUpdate.getEnum( "check" ) )
);
if ( sqlUpdate.verify() != Expectation.class ) {
collection.setUpdateExpectation( getDefaultSupplier( sqlUpdate.verify() ) );
final ClassDetails verifier = sqlUpdate.getClassDetails( "verify" );
if ( !verifier.getName().equals( Expectation.class.getName() ) ) {
collection.setUpdateExpectation( getDefaultSupplier( verifier.toJavaClass() ) );
}
}
@ -1370,8 +1372,9 @@ public abstract class CollectionBinder {
sqlDelete.getBoolean( "callable" ),
fromResultCheckStyle( sqlDelete.getEnum( "check" ) )
);
if ( sqlDelete.verify() != Expectation.class ) {
collection.setDeleteExpectation( getDefaultSupplier( sqlDelete.verify() ) );
final ClassDetails verifier = sqlDelete.getClassDetails( "verify" );
if ( !verifier.getName().equals( Expectation.class.getName() ) ) {
collection.setDeleteExpectation( getDefaultSupplier( verifier.toJavaClass() ) );
}
}
@ -1382,8 +1385,9 @@ public abstract class CollectionBinder {
sqlDeleteAll.getBoolean( "callable" ),
fromResultCheckStyle( sqlDeleteAll.getEnum( "check" ) )
);
if ( sqlDeleteAll.verify() != Expectation.class ) {
collection.setDeleteAllExpectation( getDefaultSupplier( sqlDeleteAll.verify() ) );
final ClassDetails verifier = sqlDeleteAll.getClassDetails( "verify" );
if ( !verifier.getName().equals( Expectation.class.getName() ) ) {
collection.setDeleteAllExpectation( getDefaultSupplier( verifier.toJavaClass() ) );
}
}

7
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmAttributeJoin.java
View File

@ -10,7 +10,6 @@ import org.hibernate.metamodel.model.domain.EntityDomainType;
import org.hibernate.metamodel.model.domain.PersistentAttribute;
import org.hibernate.query.criteria.JpaExpression;
import org.hibernate.query.criteria.JpaPredicate;
import org.hibernate.query.criteria.JpaSelection;
import org.hibernate.query.sqm.NodeBuilder;
import org.hibernate.query.sqm.SemanticQueryWalker;
import org.hibernate.query.sqm.SqmJoinable;
@ -93,12 +92,10 @@ public abstract class AbstractSqmAttributeJoin<L, R>
return fetched;
}
@Override
public JpaSelection<R> alias(String name) {
public SqmAttributeJoin<L,R> alias(String name) {
validateFetchAlias( name );
return super.alias( name );
return (SqmAttributeJoin<L, R>) super.alias( name );
}
@Override