Add @CollectionTableOverride annotation for embeddable collections #11322
Conversation
|
Thanks for your pull request! This pull request appears to follow the contribution rules. › This message was automatically generated. |
RealTake
changed the title
gavinking
left a comment
gavinking
left a comment
There was a problem hiding this comment.
Two requests:
- we should allow the user to specify a whole
CollectionTablenested annotation, and - the code formatting should be adjusted to follow the Hibernate conventions (spaces around parenthesized expressions).
|
|
||
| // Get the ClassDetails from the models context | ||
| final var modelsContext = buildingContext.getBootstrapContext().getModelsContext(); | ||
| final ClassDetails entityClassDetails = modelsContext.getClassDetailsRegistry() |
There was a problem hiding this comment.
| final ClassDetails entityClassDetails = modelsContext.getClassDetailsRegistry() | |
| final var entityClassDetails = modelsContext.getClassDetailsRegistry() |
| /** | ||
| * The name of the collection table to use instead of the default. | ||
| */ | ||
| String table(); |
There was a problem hiding this comment.
I believe we should make this jakarta.persistence.CollectionTable table() instead of just a string table name.
This is analogous to how AttributeOverride has Column column().
| } | ||
| } | ||
| if (entityField == null) { | ||
| for (MemberDetails member : entityClassDetails.getMethods()) { |
There was a problem hiding this comment.
| for (MemberDetails member : entityClassDetails.getMethods()) { | |
| for ( var member : entityClassDetails.getMethods() ) { |
| MemberDetails entityField = null; | ||
| try { | ||
| // Try to get the property from the entity class | ||
| for (MemberDetails member : entityClassDetails.getFields()) { |
There was a problem hiding this comment.
| for (MemberDetails member : entityClassDetails.getFields()) { | |
| for ( var member : entityClassDetails.getFields() ) { |
…names for embeddable collection fields
| private String name; | ||
|
|
||
| @Embedded | ||
| @CollectionTableOverride(name = "phones", table = "person_phones") |
There was a problem hiding this comment.
Did you try @AssociationOverride(name = "phones", joinTable = @JoinTable(name = "person_phones"))? It seems to me that the annotation would already serve the purpose for overriding the table name as well as join columns. I'd also say that using the existing annotation would be preferable to creating new ones.
There was a problem hiding this comment.
Rrrrrmrmmrrmmmm .... maybe.
Not sure I agree here, @beikov. It's pretty clear that in JPA @AssociationOverride is intended for overriding a @JoinTable, not for overriding a @CollectionTable.
Now, what's the difference between a @JoinTable and a @CollectionTable? Not a whole lot I suppose, and so yes, perhaps we could abuse the @AssociationOverride annotation for this, but it would be an abuse.
Perhaps this is something that should be addressed at the spec level with a new @ElementCollectionOverride annotation. Dunno.
There was a problem hiding this comment.
Well actually, I just found this section of the spec:
To override the default properties of the column used for a basic type, the Column annotation is used on the collection-valued attribute in addition to the ElementCollection annotation. The value of the table element of the Column annotation defaults to the name of the collection table.
To override these defaults for an embeddable class, the AttributeOverride and/or AttributeOverrides annotations must be used in addition to the ElementCollection annotation. The value of the table element of the Column annotation used in the AttributeOverride annotation defaults to the name of the collection table. If the embeddable class contains references to other entities, the default values for the columns corresponding to those references may be overridden by means of the AssociationOverride and/or AssociationOverrides annotations.
So I guess by overriding every column with @AttributeOverride and specifying a table it would be overridden?
There was a problem hiding this comment.
But then there is also this section:
A collection table is created for the mapping of an element collection. See Section 11.1.8 for the rules that apply to the generation of collection tables. The Column, AttributeOverride, and AssociationOverride annotations may be used to override CollectionTable mappings, as described in Section 11.1.9, Section 11.1.4, and Section 11.1.2 respectively.
There was a problem hiding this comment.
Pfffffffffff shit I have little idea what that means.
But I don't think it means what you're suggestion. I think it's much more likely talking about the case where you have the embeddable as the element of the collection.
| final String fieldName; | ||
| if (fullPath.contains(".")) { | ||
| fieldName = fullPath.substring(0, fullPath.indexOf('.')); | ||
| } else { |
There was a problem hiding this comment.
| } else { | |
| } | |
| else { |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| String overrideName, | ||
| PropertyHolder propertyHolder, | ||
| MemberDetails property, | ||
| PropertyData inferredData) { |
Check notice
Code scanning / CodeQL
Useless parameter
Replace table name string with nested @CollectionTable annotation to allow full collection table configuration override, including schema, catalog, joinColumns, indexes, and other attributes.
RealTake
force-pushed
the
main
branch
2 times, most recently
from
29cfa63 to
43ced16
Compare
|
I’ve applied your requests.
|
3 participants
Add @CollectionTableOverride annotation for embeddable collections
This change was introduced to address a limitation in Hibernate where
entities cannot override the @CollectionTable(name = ...) defined inside an embeddable class.
When multiple entities share the same embeddable, it becomes impossible to customize the collection table name per entity, causing conflicts in DDL generation or preventing reuse of embeddable components.
To fix this, a new annotation (@CollectionTableOverride) was implemented, allowing entities to override the collection table name for collections declared inside embeddable classes.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.
https://hibernate.atlassian.net/browse/HHH-19952