HHH-19862: fix CriteriaUpdate for converted field

Author: tcordel

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java

@@ -171,7 +171,9 @@ public void setSetClause(SqmSetClause setClause) {
 
 	@Override
 	public <Y, X extends Y> SqmUpdateStatement<T> set(SingularAttribute<? super T, Y> attribute, X value) {
-		applyAssignment( getTarget().get( attribute ), (SqmExpression<? extends Y>) nodeBuilder().value( value ) );
+		final SqmCriteriaNodeBuilder nodeBuilder = (SqmCriteriaNodeBuilder) nodeBuilder();
+		SqmPath<Y> sqmAttribute = getTarget().get( attribute );
+		applyAssignment( sqmAttribute, nodeBuilder.value( value, sqmAttribute) );
 		return this;
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/ConvertedDateAttributeTest.java

@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.jpa.criteria.convert;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Root;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.Date;
+
+@DomainModel( annotatedClasses = { Log.class } )
+@SessionFactory
+public class ConvertedDateAttributeTest {
+	@Test
+	public void testConvertedFieldUpdateUsingStaticModel(SessionFactoryScope scope) {
+
+		scope.inTransaction( (session) -> {
+			final CriteriaBuilder cb = session.getCriteriaBuilder();
+			final CriteriaUpdate<Log> query = cb.createCriteriaUpdate( Log.class );
+			query.set( Log_.date, new Date());
+			session.createMutationQuery( query ).executeUpdate();
+		} );
+
+	}
+
+	@Test
+	public void testConvertedFieldUpdateUsingPath(SessionFactoryScope scope) {
+
+		scope.inTransaction( (session) -> {
+			final CriteriaBuilder cb = session.getCriteriaBuilder();
+			final CriteriaUpdate<Log> query = cb.createCriteriaUpdate( Log.class );
+			final Root<Log> root = query.from( Log.class );
+			query.set(root.get(Log_.date), new Date());
+			session.createMutationQuery( query ).executeUpdate();
+		} );
+
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/convert/Log.java

@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.jpa.criteria.convert;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Converter;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import java.util.Date;
+@Entity
+public class Log {
+	@Id
+	private Long id;
+	@Convert(converter = DateConverter.class)
+	private Date date;
+	@Converter
+	static class DateConverter implements AttributeConverter<Date, Long> {
+		@Override
+		public Long convertToDatabaseColumn(Date date) {
+			return date.getTime();
+		}
+		@Override
+		public Date convertToEntityAttribute(Long dbDate) {
+			return new Date( dbDate );
+		}
+	}
+}