HHH-15842 Convert simple foreign key values before binding

hibernate · Dec 21, 2022 · 03df7da · 03df7da
1 parent 6d76b5a
commit 03df7da
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...re/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java b/...re/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
@@ -28,6 +28,7 @@
 import org.hibernate.metamodel.mapping.PropertyBasedMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.metamodel.model.convert.spi.BasicValueConverter;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.proxy.HibernateProxy;
@@ -377,7 +378,9 @@ public EntityMappingType findContainingEntityMapping() {
 
 	@Override
 	public Object disassemble(Object value, SharedSessionContractImplementor session) {
-		return value;
+		BasicValueConverter valueConverter = getJdbcMapping().getValueConverter();
+
+		return valueConverter == null ? value : valueConverter.toRelationalValue( value );
 	}
 
 	@Override
@@ -420,7 +423,7 @@ public int forEachDisassembledJdbcValue(
 
 	@Override
 	public void breakDownJdbcValues(Object domainValue, JdbcValueConsumer valueConsumer, SharedSessionContractImplementor session) {
-		valueConsumer.consume( domainValue, keySide.getModelPart() );
+		valueConsumer.consume( disassemble( domainValue, session ), keySide.getModelPart() );
 	}
 
 	@Override
@@ -467,7 +470,7 @@ public int forEachJdbcValue(
 			int offset,
 			JdbcValuesConsumer valuesConsumer,
 			SharedSessionContractImplementor session) {
-		valuesConsumer.consume( offset, value, targetSide.getModelPart().getJdbcMapping() );
+		valuesConsumer.consume( offset, disassemble( value, session ), targetSide.getModelPart().getJdbcMapping() );
 		return getJdbcTypeCount();
 	}