Skip to content

Commit d3eb6cd

Browse files
committed
HHH-19362 JsonHelper improvements to handle more mapping types
- Add the `expandProperties` flag that indicates when serializing entier object trees - Handle entity values, including tracking circular relationships - Handle plural attribute values
1 parent 139abfa commit d3eb6cd

File tree

5 files changed

+307
-93
lines changed

5 files changed

+307
-93
lines changed

hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLStructJdbcType.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.hibernate.type.descriptor.jdbc.StructJdbcType;
4242
import org.hibernate.type.spi.TypeConfiguration;
4343

44-
import static org.hibernate.dialect.StructHelper.getEmbeddedPart;
44+
import static org.hibernate.dialect.StructHelper.getSubPart;
4545
import static org.hibernate.dialect.StructHelper.instantiate;
4646
import static org.hibernate.type.descriptor.DateTimeUtils.appendAsDate;
4747
import static org.hibernate.type.descriptor.DateTimeUtils.appendAsLocalTime;
@@ -999,7 +999,7 @@ private SelectableMapping getJdbcValueSelectable(int jdbcValueSelectableIndex) {
999999
final int size = numberOfAttributeMappings + ( embeddableMappingType.isPolymorphic() ? 1 : 0 );
10001000
int count = 0;
10011001
for ( int i = 0; i < size; i++ ) {
1002-
final ValuedModelPart modelPart = getEmbeddedPart( embeddableMappingType, orderMapping[i] );
1002+
final ValuedModelPart modelPart = getSubPart( embeddableMappingType, orderMapping[i] );
10031003
final MappingType mappedType = modelPart.getMappedType();
10041004
if ( mappedType instanceof EmbeddableMappingType embeddableMappingType ) {
10051005
final SelectableMapping aggregateMapping = embeddableMappingType.getAggregateMapping();
@@ -1379,7 +1379,7 @@ private StructAttributeValues getAttributeValues(
13791379
attributeIndex = orderMapping[i];
13801380
}
13811381
jdbcIndex += injectAttributeValue(
1382-
getEmbeddedPart( embeddableMappingType, attributeIndex ),
1382+
getSubPart( embeddableMappingType, attributeIndex ),
13831383
attributeValues,
13841384
attributeIndex,
13851385
rawJdbcValues,

0 commit comments

Comments
 (0)