Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-17 08:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Register JPA embeddable types properly, allow access to functions in registry and fix AttributeClassifications

Browse Source
This commit is contained in:
Christian Beikov 2020-01-28 22:37:40 +01:00 committed by Steve Ebersole
parent 98414b1a92
commit 31377b1423
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java
View File

@ -13,9 +13,9 @@ public enum AttributeClassification {
EMBEDDED( PersistentAttributeType.EMBEDDED ), EMBEDDED( PersistentAttributeType.EMBEDDED ),
ANY( null ), ANY( null ),
ONE_TO_ONE( PersistentAttributeType.ONE_TO_ONE ), ONE_TO_ONE( PersistentAttributeType.ONE_TO_ONE ),
MANY_TO_ONE( PersistentAttributeType.EMBEDDED ), MANY_TO_ONE( PersistentAttributeType.MANY_TO_ONE ),
ELEMENT_COLLECTION( PersistentAttributeType.ELEMENT_COLLECTION ), ELEMENT_COLLECTION( PersistentAttributeType.ELEMENT_COLLECTION ),
ONE_TO_MANY( PersistentAttributeType.MANY_TO_ONE ), ONE_TO_MANY( PersistentAttributeType.ONE_TO_MANY ),
MANY_TO_MANY( PersistentAttributeType.MANY_TO_MANY ); MANY_TO_MANY( PersistentAttributeType.MANY_TO_MANY );
private final PersistentAttributeType jpaClassification; private final PersistentAttributeType jpaClassification;

1
hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
View File

@ -344,6 +344,7 @@ else if ( MappedSuperclass.class.isAssignableFrom( mapping.getClass() ) ) {
} }
( ( AttributeContainer) embeddable ).getInFlightAccess().finishUp(); ( ( AttributeContainer) embeddable ).getInFlightAccess().finishUp();
embeddables.put( embeddable.getJavaType(), embeddable );
if ( staticMetamodelScanEnabled ) { if ( staticMetamodelScanEnabled ) {
populateStaticMetamodel( embeddable ); populateStaticMetamodel( embeddable );

4
hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java
View File

@ -36,6 +36,10 @@ public SqmFunctionRegistry() {
log.tracef( "SqmFunctionRegistry created" ); log.tracef( "SqmFunctionRegistry created" );
} }
public Map<String, SqmFunctionDescriptor> getFunctions() {
return functionMap;
}
/** /**
* Find a SqmFunctionTemplate by name. Returns {@code null} if * Find a SqmFunctionTemplate by name. Returns {@code null} if
* no such function is found. * no such function is found.