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

Implemented SingularAssociationAttributeMapping circular fetch detection for ToOne with JoinTable

This commit is contained in:
Andrea Boriero 2020-01-31 11:54:14 +00:00
parent 2afd4c8123
commit f3b2a1537b
3 changed files with 86 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java
View File

@ -64,6 +64,10 @@ public interface ForeignKeyDescriptor extends VirtualModelPart {
void visitColumnMappings(FkColumnMappingConsumer consumer);
<T> T visitColumnMapping(FkColumnMappingFunction<T> function);
// todo (6.0): the 2 interfaces does not take into account composite keys, referringColumn
// and targetColumn should be collections
interface FkColumnMappingConsumer {
void consume(
String referringTable,
@ -72,4 +76,14 @@ public interface ForeignKeyDescriptor extends VirtualModelPart {
String targetColumn,
JdbcMapping jdbcMapping);
}
interface FkColumnMappingFunction<T> {
T apply(
String referringTable,
String referringColumn,
String targetTable,
String targetColumn,
JdbcMapping jdbcMapping);
}
}

11
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
View File

@ -296,6 +296,17 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa
consumer.accept( targetColumnContainingTable, targetColumnExpression, jdbcMapping );
}
@Override
public <T> T visitColumnMapping(FkColumnMappingFunction<T> function) {
return function.apply(
keyColumnContainingTable,
keyColumnExpression ,
targetColumnContainingTable,
targetColumnExpression ,
jdbcMapping
);
}
@Override
public void visitColumnMappings(FkColumnMappingConsumer consumer) {
consumer.consume(

77
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingularAssociationAttributeMapping.java
View File

@ -12,6 +12,7 @@ import java.util.List;
import org.hibernate.HibernateException;
import org.hibernate.LockMode;
import org.hibernate.NotYetImplementedFor6Exception;
import org.hibernate.engine.FetchStrategy;
import org.hibernate.engine.FetchTiming;
import org.hibernate.mapping.ManyToOne;
@ -26,6 +27,7 @@ import org.hibernate.metamodel.mapping.ModelPart;
import org.hibernate.metamodel.mapping.StateArrayContributorMetadataAccess;
import org.hibernate.metamodel.model.domain.NavigableRole;
import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.persister.entity.SingleTableEntityPersister;
import org.hibernate.property.access.spi.PropertyAccess;
import org.hibernate.query.NavigablePath;
import org.hibernate.sql.ast.SqlAstJoinType;
@ -208,36 +210,79 @@ public class SingularAssociationAttributeMapping extends AbstractSingularAttribu
return null;
}
final FetchParent associationParent = fetchParent.resolveContainingAssociationParent();
assert associationParent.getReferencedModePart() instanceof Association;
final FetchParent associationFetchParent = fetchParent.resolveContainingAssociationParent();
assert associationFetchParent.getReferencedModePart() instanceof Association;
final Association association = (Association) associationParent.getReferencedModePart();
final Association associationParent = (Association) associationFetchParent.getReferencedModePart();
if ( Arrays.equals( association.getIdentifyingColumnExpressions(), this.getIdentifyingColumnExpressions() ) ) {
if ( Arrays.equals( associationParent.getIdentifyingColumnExpressions(), this.getIdentifyingColumnExpressions() ) ) {
// we need to determine the NavigablePath referring to the entity that the bi-dir
// fetch will "return" for its Assembler. so we walk "up" the FetchParent graph
// to find the "referenced entity" reference
final EntityResultGraphNode referencedEntityReference = resolveEntityGraphNode( fetchParent );
return createBiDirectionalFetch( fetchablePath, fetchParent );
}
if ( referencedEntityReference == null ) {
throw new HibernateException(
"Could not locate entity-valued reference for circular path `" + fetchablePath + "`"
);
// this is the case of a JoinTable
// PARENT(id)
// PARENT_CHILD(parent_id, child_id)
// CHILD(id)
// the FKDescriptor for the association `Parent.child` will be
// PARENT_CHILD.child.id -> CHILD.id
// and the FKDescriptor for the association `Child.parent` will be
// PARENT_CHILD.parent.id -> PARENT.id
// in such a case the associationParent.getIdentifyingColumnExpressions() is PARENT_CHILD.parent_id
// while the getIdentifyingColumnExpressions for this association is PARENT_CHILD.child_id
// so we will check if the parentAssociation ForeignKey Target match with the association entity identifier table and columns
final ForeignKeyDescriptor associationParentForeignKeyDescriptor = associationParent.getForeignKeyDescriptor();
if ( this.foreignKeyDescriptor.getReferringTableExpression().equals( associationParentForeignKeyDescriptor
.getReferringTableExpression() ) ) {
final SingleTableEntityPersister entityPersister = (SingleTableEntityPersister) getDeclaringType();
if ( associationParentForeignKeyDescriptor.getTargetTableExpression()
.equals( entityPersister.getTableName() ) ) {
final String[] identifierColumnNames = entityPersister.getIdentifierColumnNames();
return associationParentForeignKeyDescriptor.visitColumnMapping( (referringTable, referringColumns, targetTable, targetColumns, jdbcMapping) -> {
// if ( identifierColumnNames.length == targetColumns.size() ) {
// for ( int i = 0; i < identifierColumnNames.length; i++ ) {
// if ( !targetColumns.contains( identifierColumnNames[i] ) ) {
// return null;
// }
// }
if ( identifierColumnNames.length > 1 ) {
throw new NotYetImplementedFor6Exception(
"Support for composite foreign -keys not yet implemented" );
}
if ( targetColumns.equals( identifierColumnNames[0] ) ) {
return createBiDirectionalFetch( fetchablePath, fetchParent );
}
// }
return null;
} );
}
return new BiDirectionalFetchImpl(
FetchTiming.IMMEDIATE,
fetchablePath,
fetchParent,
this,
referencedEntityReference.getNavigablePath()
);
}
return null;
}
private Fetch createBiDirectionalFetch(NavigablePath fetchablePath, FetchParent fetchParent) {
final EntityResultGraphNode referencedEntityReference = resolveEntityGraphNode( fetchParent );
if ( referencedEntityReference == null ) {
throw new HibernateException(
"Could not locate entity-valued reference for circular path `" + fetchablePath + "`"
);
}
return new BiDirectionalFetchImpl(
FetchTiming.IMMEDIATE,
fetchablePath,
fetchParent,
this,
referencedEntityReference.getNavigablePath()
);
}
protected EntityResultGraphNode resolveEntityGraphNode(FetchParent fetchParent) {
FetchParent processingParent = fetchParent;
while ( processingParent != null ) {