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

sketch for ForeignKeyDescriptor handling for to-one associations

This commit is contained in:
Steve Ebersole 2019-11-01 12:00:55 -05:00
parent 85f129daeb
commit 2ea03f7d56
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
View File

@ -40,6 +40,7 @@ import org.hibernate.mapping.Selectable;
import org.hibernate.mapping.ToOne; import org.hibernate.mapping.ToOne;
import org.hibernate.mapping.Value; import org.hibernate.mapping.Value;
import org.hibernate.metamodel.CollectionClassification; import org.hibernate.metamodel.CollectionClassification;
import org.hibernate.metamodel.mapping.AttributeMapping;
import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping; import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.BasicValuedMapping;
import org.hibernate.metamodel.mapping.BasicValuedModelPart; import org.hibernate.metamodel.mapping.BasicValuedModelPart;
@ -621,8 +622,6 @@ public class MappingModelCreationHelper {
int stateArrayPosition, int stateArrayPosition,
Property bootProperty, Property bootProperty,
ManagedMappingType declaringType, ManagedMappingType declaringType,
String tableExpression,
String[] attrColumnExpressions,
PropertyAccess propertyAccess, PropertyAccess propertyAccess,
CascadeStyle cascadeStyle, CascadeStyle cascadeStyle,
MappingModelCreationProcess creationProcess) { MappingModelCreationProcess creationProcess) {
@ -637,7 +636,7 @@ public class MappingModelCreationHelper {
final CollectionPersister collectionDescriptor = domainModel.findCollectionDescriptor( bootValueMapping.getRole() ); final CollectionPersister collectionDescriptor = domainModel.findCollectionDescriptor( bootValueMapping.getRole() );
assert collectionDescriptor != null; assert collectionDescriptor != null;
tableExpression = ( (Joinable) collectionDescriptor ).getTableName(); String tableExpression = ( (Joinable) collectionDescriptor ).getTableName();
final String sqlAliasStem = SqlAliasStemHelper.INSTANCE.generateStemFromAttributeName( bootProperty.getName() ); final String sqlAliasStem = SqlAliasStemHelper.INSTANCE.generateStemFromAttributeName( bootProperty.getName() );
@ -647,6 +646,7 @@ public class MappingModelCreationHelper {
final ForeignKeyDescriptor keyDescriptor = interpretKeyDescriptor( final ForeignKeyDescriptor keyDescriptor = interpretKeyDescriptor(
bootProperty, bootProperty,
bootValueMapping, bootValueMapping,
collectionDescriptor,
dialect, dialect,
creationProcess creationProcess
); );
@ -848,6 +848,7 @@ public class MappingModelCreationHelper {
private static ForeignKeyDescriptor interpretKeyDescriptor( private static ForeignKeyDescriptor interpretKeyDescriptor(
Property bootProperty, Property bootProperty,
Collection bootValueMapping, Collection bootValueMapping,
CollectionPersister collectionDescriptor,
Dialect dialect, Dialect dialect,
MappingModelCreationProcess creationProcess) { MappingModelCreationProcess creationProcess) {
final Type keyType = bootValueMapping.getKey().getType(); final Type keyType = bootValueMapping.getKey().getType();
@ -861,7 +862,46 @@ public class MappingModelCreationHelper {
} }
throw new NotYetImplementedFor6Exception( throw new NotYetImplementedFor6Exception(
"Support for composite collection foreign-keys not yet implemented: " + bootValueMapping.getRole() "Support for composite foreign-keys not yet implemented: " + bootValueMapping.getRole()
);
}
private static ForeignKeyDescriptor interpretKeyDescriptor(
Property bootProperty,
ToOne bootValueMapping,
EntityPersister referencedEntityDescriptor,
Dialect dialect,
MappingModelCreationProcess creationProcess) {
if ( bootValueMapping.isReferenceToPrimaryKey() ) {
final EntityIdentifierMapping identifierMapping = referencedEntityDescriptor.getIdentifierMapping();
if ( identifierMapping instanceof BasicEntityIdentifierMapping ) {
final BasicEntityIdentifierMapping simpleIdMapping = (BasicEntityIdentifierMapping) identifierMapping;
assert bootValueMapping.getColumnSpan() == 1;
return new SimpleForeignKeyDescriptor(
bootValueMapping.getColumnIterator().next().getText( dialect ),
simpleIdMapping.getJdbcMapping()
);
}
}
else {
final AttributeMapping attributeMapping = referencedEntityDescriptor.findAttributeMapping(
bootValueMapping.getReferencedPropertyName()
);
if ( attributeMapping instanceof BasicValuedSingularAttributeMapping ) {
final BasicValuedSingularAttributeMapping basicMapping = (BasicValuedSingularAttributeMapping) attributeMapping;
assert bootValueMapping.getColumnSpan() == 1;
return new SimpleForeignKeyDescriptor(
bootValueMapping.getColumnIterator().next().getText( dialect ),
basicMapping.getJdbcMapping()
);
}
}
throw new NotYetImplementedFor6Exception(
"Support for composite foreign-keys not yet implemented: " +
bootProperty.getPersistentClass().getEntityName() + " -> " + bootProperty.getName()
); );
} }

2
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -6367,8 +6367,6 @@ public abstract class AbstractEntityPersister
stateArrayPosition, stateArrayPosition,
bootProperty, bootProperty,
declaringType, declaringType,
tableExpression,
attrColumnNames,
propertyAccess, propertyAccess,
tupleAttrDefinition.getCascadeStyle(), tupleAttrDefinition.getCascadeStyle(),
creationProcess creationProcess