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

fix logic for interpreting HQL literal enum values 

Note that this feature still doesn't work because we still
can't get a MappingModelExpressable from an SqmEnumLiteral.
This commit is contained in:
gavinking 2020-02-22 15:19:31 +01:00
parent e808041477
commit 3545de74ea
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java
View File

@ -196,6 +196,7 @@ public class BasicDotIdentifierConsumer implements DotIdentifierConsumer {
if ( splitPosition > 0 ) {
final String prefix = pathSoFar.substring( 0, splitPosition );
final String terminal = pathSoFar.substring( splitPosition + 1 );
//TODO: try interpreting paths of form foo.bar.Foo.Bar as foo.bar.Foo$Bar
try {
final Class<?> namedClass = creationContext
@ -206,6 +207,16 @@ public class BasicDotIdentifierConsumer implements DotIdentifierConsumer {
final JavaTypeDescriptorRegistry javaTypeDescriptorRegistry = creationContext.getJpaMetamodel()
.getTypeConfiguration()
.getJavaTypeDescriptorRegistry();
if ( namedClass.isEnum() ) {
return new SqmEnumLiteral(
Enum.valueOf( (Class) namedClass, terminal ),
(EnumJavaTypeDescriptor<?>) javaTypeDescriptorRegistry.resolveDescriptor( namedClass ),
terminal,
creationContext.getNodeBuilder()
);
}
try {
final Field referencedField = namedClass.getDeclaredField( terminal );
if ( referencedField != null ) {
@ -217,18 +228,6 @@ public class BasicDotIdentifierConsumer implements DotIdentifierConsumer {
}
catch (Exception ignore) {
}
if ( namedClass.isEnum() ) {
//noinspection unchecked
final Enum referencedEnum = Enum.valueOf( (Class) namedClass, terminal );
//noinspection unchecked
return new SqmEnumLiteral(
referencedEnum,
(EnumJavaTypeDescriptor) javaTypeDescriptorRegistry.resolveDescriptor( namedClass ),
terminal,
creationContext.getNodeBuilder()
);
}
}
}
catch (Exception ignore) {