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

work on aggregate composite identifier

This commit is contained in:
Andrea Boriero 2019-11-21 22:14:45 +00:00 committed by Steve Ebersole
parent 8e81f54a86
commit 03c5bd406f
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
View File

@ -50,13 +50,17 @@ import org.hibernate.sql.results.spi.DomainResult;
import org.hibernate.sql.results.spi.DomainResultCreationState;
import org.hibernate.sql.results.spi.Fetch;
import org.hibernate.sql.results.spi.FetchParent;
import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
import org.hibernate.type.spi.TypeConfiguration;
/**
* @author Andrea Boriero
*/
public class EmbeddedIdentifierMappingImpl extends AbstractStateArrayContributorMapping
public class EmbeddedIdentifierMappingImpl
implements EmbeddedIdentifierMapping {
private final String name;
private final MappingType type;
private final StateArrayContributorMetadataAccess attributeMetadataAccess;
private final PropertyAccess propertyAccess;
private final String tableExpression;
private final String[] attrColumnNames;
@ -65,21 +69,25 @@ public class EmbeddedIdentifierMappingImpl extends AbstractStateArrayContributor
String name,
MappingType type,
StateArrayContributorMetadataAccess attributeMetadataAccess,
FetchStrategy mappedFetchStrategy,
int stateArrayPosition,
ManagedMappingType declaringType,
PropertyAccess propertyAccess,
String tableExpression,
String[] attrColumnNames) {
super( name, type, attributeMetadataAccess, mappedFetchStrategy, stateArrayPosition, declaringType );
this.name = name;
this.type = type;
this.attributeMetadataAccess = attributeMetadataAccess;
this.propertyAccess = propertyAccess;
this.tableExpression = tableExpression;
this.attrColumnNames = attrColumnNames;
}
@Override
public JavaTypeDescriptor getJavaTypeDescriptor() {
return getMappedTypeDescriptor().getMappedJavaTypeDescriptor();
}
@Override
public String getPartName() {
return getAttributeName();
return name;
}
@Override
@ -94,7 +102,7 @@ public class EmbeddedIdentifierMappingImpl extends AbstractStateArrayContributor
@Override
public EmbeddableMappingType getMappedTypeDescriptor() {
return (EmbeddableMappingType) super.getMappedTypeDescriptor();
return (EmbeddableMappingType) type;
}
@Override
@ -209,7 +217,7 @@ public class EmbeddedIdentifierMappingImpl extends AbstractStateArrayContributor
@Override
public String getSqlAliasStem() {
return getAttributeName();
return name;
}
@Override
@ -254,6 +262,16 @@ public class EmbeddedIdentifierMappingImpl extends AbstractStateArrayContributor
);
}
@Override
public String getFetchableName() {
return name;
}
@Override
public FetchStrategy getMappedFetchStrategy() {
return null;
}
@Override
public Fetch generateFetch(
FetchParent fetchParent,
@ -268,7 +286,7 @@ public class EmbeddedIdentifierMappingImpl extends AbstractStateArrayContributor
this,
fetchParent,
fetchTiming,
getAttributeMetadataAccess().resolveAttributeMetadata( null ).isNullable(),
attributeMetadataAccess.resolveAttributeMetadata( null ).isNullable(),
creationState
);
}

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

@ -307,9 +307,6 @@ public class MappingModelCreationHelper {
attributeName,
attributeMappingType,
attributeMetadataAccess,
FetchStrategy.IMMEDIATE_JOIN,
0,
entityPersister,
propertyAccess,
rootTableName,
rootTableKeyColumnNames