Skip to content

Backport HHH-19570 to branch 7.0 - HQL with jpamodelgen fails compilation when querying by natural id named id #10401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2025
Merged

Backport HHH-19570 to branch 7.0 - HQL with jpamodelgen fails compilation when querying by natural id named id #10401

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions ...model-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,36 @@ public String getEntityName() {

@Override
public final Type getPropertyType(String propertyPath) {
Type result = propertyTypesByName.get(propertyPath);
if (result!=null) {
return result;
final Type cached = propertyTypesByName.get(propertyPath);
if ( cached == null ) {
final Type type = propertyType( propertyPath );
if ( type != null ) {
propertyTypesByName.put( propertyPath, type );
}
return type;
}
else {
return cached;
}
}

result = createPropertyType(propertyPath);
if (result == null) {
//check subclasses, needed for treat()
result = getSubclassPropertyType(propertyPath);
private Type propertyType(String propertyPath) {
final Type type = createPropertyType( propertyPath );
if ( type != null ) {
return type;
}

if ("id".equals( propertyPath )) {
result = identifierType();
//check subclasses, needed for treat()
final Type typeFromSubclass = getSubclassPropertyType( propertyPath );
if ( typeFromSubclass != null ) {
return typeFromSubclass;
}

if (result!=null) {
propertyTypesByName.put(propertyPath, result);
if ( "id".equals( propertyPath ) ) {
return identifierType();
}
return result;

return null;
}

abstract Type createPropertyType(String propertyPath);
Expand Down