Skip to content

HHH-19011 fix incorrect placement of table comment with @Comment #9567

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 2 commits into from
Jan 6, 2025
Merged

HHH-19011 fix incorrect placement of table comment with @Comment #9567

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0e4dc7
HHH-19011 fix incorrect placement of table comment with @Comment
gavinking Jan 5, 2025
c10ff2b
HHH-19011 two extra fixes
gavinking Jan 5, 2025
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
32 changes: 20 additions & 12 deletions hibernate-core/src/main/java/org/hibernate/binder/internal/CommentBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,30 @@ public void bind(Comment comment, MetadataBuildingContext context, PersistentCla
+ "' was annotated '@Comment'");
}
else if ( value instanceof Collection collection ) {
Table table = collection.getTable();
Table table = collection.getCollectionTable();
// by default, the comment goes on the table
if ( on.isEmpty() || table.getName().equalsIgnoreCase( on ) ) {
table.setComment( text );
}
// but if 'on' is explicit, it can go on a column
Value element = collection.getElement();
for ( Column column : element.getColumns() ) {
if ( column.getName().equalsIgnoreCase( on ) ) {
column.setComment( text );
else {
// but if 'on' is explicit, it can go on a column
for ( Column column : table.getColumns() ) {
if ( column.getName().equalsIgnoreCase( on ) ) {
column.setComment( text );
return;
}
}
throw new AnnotationException( "No matching column for '@Comment(on=\"" + on + "\")'" );
}
//TODO: list index / map key columns
}
else {
for ( Column column : value.getColumns() ) {
if ( on.isEmpty() || column.getName().equalsIgnoreCase( on ) ) {
column.setComment( text );
return;
}
}
throw new AnnotationException( "No matching column for '@Comment(on=\"" + on + "\")'" );
}
}

Expand All @@ -67,12 +71,16 @@ public void bind(Comment comment, MetadataBuildingContext context, PersistentCla
if ( on.isEmpty() || primary.getName().equalsIgnoreCase( on ) ) {
primary.setComment( text );
}
// but if 'on' is explicit, it can go on a secondary table
for ( Join join : entity.getJoins() ) {
Table secondary = join.getTable();
if ( secondary.getName().equalsIgnoreCase( on ) ) {
secondary.setComment( text );
else {
// but if 'on' is explicit, it can go on a secondary table
for ( Join join : entity.getJoins() ) {
Table secondary = join.getTable();
if ( secondary.getName().equalsIgnoreCase( on ) ) {
secondary.setComment( text );
return;
}
}
throw new AnnotationException( "No matching column for '@Comment(on=\"" + on + "\")'" );
}
}

Expand Down
Loading