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

HHH-11410 - Fixed ManyToMany with an active Filter to apply the condition on the join.

This commit is contained in:
Chris Cranford 2017-02-05 00:41:16 -05:00 committed by Andrea Boriero
parent 10fe238688
commit c87194c3fe
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/LoadQueryJoinAndFetchProcessor.java
View File

@ -60,6 +60,7 @@ import org.jboss.logging.Logger;
* </ol> * </ol>
* *
* @author Steve Ebersole * @author Steve Ebersole
* @author Chris Cranford
*/ */
public class LoadQueryJoinAndFetchProcessor { public class LoadQueryJoinAndFetchProcessor {
private static final Logger LOG = CoreLogging.logger( LoadQueryJoinAndFetchProcessor.class ); private static final Logger LOG = CoreLogging.logger( LoadQueryJoinAndFetchProcessor.class );
@ -182,7 +183,8 @@ public class LoadQueryJoinAndFetchProcessor {
addJoins( addJoins(
join, join,
joinFragment, joinFragment,
joinable joinable,
null
); );
} }
@ -223,8 +225,8 @@ public class LoadQueryJoinAndFetchProcessor {
private void addJoins( private void addJoins(
Join join, Join join,
JoinFragment joinFragment, JoinFragment joinFragment,
Joinable joinable) { Joinable joinable,
String joinConditions) {
final String rhsTableAlias = aliasResolutionContext.resolveSqlTableAliasFromQuerySpaceUid( final String rhsTableAlias = aliasResolutionContext.resolveSqlTableAliasFromQuerySpaceUid(
join.getRightHandSide().getUid() join.getRightHandSide().getUid()
); );
@ -239,10 +241,18 @@ public class LoadQueryJoinAndFetchProcessor {
throw new IllegalStateException( "QuerySpace with that UID was not yet registered in the AliasResolutionContext" ); throw new IllegalStateException( "QuerySpace with that UID was not yet registered in the AliasResolutionContext" );
} }
String otherConditions = join.getAnyAdditionalJoinConditions( rhsTableAlias );
if ( !StringHelper.isEmpty( otherConditions ) && !StringHelper.isEmpty( joinConditions ) ) {
otherConditions += " and " + joinConditions;
}
else if ( !StringHelper.isEmpty( joinConditions ) ) {
otherConditions = joinConditions;
}
// add join fragments from the collection table -> element entity table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // add join fragments from the collection table -> element entity table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
final String additionalJoinConditions = resolveAdditionalJoinCondition( final String additionalJoinConditions = resolveAdditionalJoinCondition(
rhsTableAlias, rhsTableAlias,
join.getAnyAdditionalJoinConditions( rhsTableAlias ), otherConditions,
joinable, joinable,
getJoinedAssociationTypeOrNull( join ) getJoinedAssociationTypeOrNull( join )
); );
@ -354,7 +364,8 @@ public class LoadQueryJoinAndFetchProcessor {
addJoins( addJoins(
join, join,
joinFragment, joinFragment,
(Joinable) rightHandSide.getCollectionPersister() (Joinable) rightHandSide.getCollectionPersister(),
null
); );
} }
@ -378,21 +389,26 @@ public class LoadQueryJoinAndFetchProcessor {
if ( StringHelper.isEmpty( entityTableAlias ) ) { if ( StringHelper.isEmpty( entityTableAlias ) ) {
throw new IllegalStateException( "Collection element (many-to-many) table alias cannot be empty" ); throw new IllegalStateException( "Collection element (many-to-many) table alias cannot be empty" );
} }
final String manyToManyFilter;
if ( JoinDefinedByMetadata.class.isInstance( join ) && if ( JoinDefinedByMetadata.class.isInstance( join ) &&
CollectionPropertyNames.COLLECTION_ELEMENTS.equals( ( (JoinDefinedByMetadata) join ).getJoinedPropertyName() ) ) { CollectionPropertyNames.COLLECTION_ELEMENTS.equals( ( (JoinDefinedByMetadata) join ).getJoinedPropertyName() ) ) {
final CollectionQuerySpace leftHandSide = (CollectionQuerySpace) join.getLeftHandSide(); final CollectionQuerySpace leftHandSide = (CollectionQuerySpace) join.getLeftHandSide();
final CollectionPersister persister = leftHandSide.getCollectionPersister(); final CollectionPersister persister = leftHandSide.getCollectionPersister();
final String manyToManyFilter = persister.getManyToManyFilterFragment( manyToManyFilter = persister.getManyToManyFilterFragment(
entityTableAlias, entityTableAlias,
buildingParameters.getQueryInfluencers().getEnabledFilters() buildingParameters.getQueryInfluencers().getEnabledFilters()
); );
joinFragment.addCondition( manyToManyFilter ); }
else {
manyToManyFilter = null;
} }
addJoins( addJoins(
join, join,
joinFragment, joinFragment,
(Joinable) entityPersister (Joinable) entityPersister,
manyToManyFilter
); );
} }