HHH-18815 allow update of @generated fields

Signed-off-by: Gavin King <[email protected]>

Author: gavinking

hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java

@@ -321,11 +321,15 @@ public EntityMetamodel(
 				}
 				else {
 					generators[i] = generator;
-					if ( generatedWithNoParameter( generator ) ) {
+					final boolean noParameter = generatedWithNoParameter( generator );
+					if ( noParameter && !generator.allowAssignedIdentifiers() ) {
 						propertyInsertability[i] = false;
 						propertyUpdateability[i] = false;
 					}
 					if ( generator.generatesOnInsert() ) {
+						if ( noParameter ) {
+							propertyInsertability[i] = false;
+						}
 						if ( generator.generatedOnExecution() ) {
 							foundPostInsertGeneratedValues = true;
 							if ( generator instanceof BeforeExecutionGenerator ) {
@@ -337,6 +341,9 @@ public EntityMetamodel(
 						}
 					}
 					if ( generator.generatesOnUpdate() ) {
+						if ( noParameter ) {
+							propertyInsertability[i] = false;
+						}
 						if ( generator.generatedOnExecution() ) {
 							foundPostUpdateGeneratedValues = true;
 							if ( generator instanceof BeforeExecutionGenerator ) {

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/SqlGeneratedTest.java

@@ -0,0 +1,102 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.generated.sql;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.Generated;
+import org.hibernate.dialect.SybaseASEDialect;
+import org.hibernate.generator.EventType;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @author Gavin King
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(annotatedClasses = SqlGeneratedTest.OrderLine.class)
+@SessionFactory
+@SkipForDialect(dialectClass = SybaseASEDialect.class,
+		reason = "The name 'current_timestamp' is illegal in this context. Only constants, constant expressions, or variables allowed here.")
+public class SqlGeneratedTest {
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		BigDecimal unitPrice = new BigDecimal("12.99");
+		scope.inTransaction( session -> {
+			OrderLine entity = new OrderLine( unitPrice, 5 );
+			session.persist(entity);
+			session.flush();
+			assertEquals( "new", entity.status );
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertNotNull( entity.updated );
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "new", entity.status );
+			assertNotNull( entity.updated );
+			entity.status = "old";
+			session.flush();
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 5, entity.quantity );
+			assertEquals( "old", entity.status );
+			assertNotNull( entity.updated );
+			LocalDateTime previous = entity.updated;
+			entity.quantity = 10;
+			session.flush();
+			assertNotNull( entity.updated );
+			assertFalse( previous == entity.updated );
+		} );
+		scope.inTransaction( session -> {
+			OrderLine entity = session.createQuery("from WithDefault", OrderLine.class ).getSingleResult();
+			assertEquals( unitPrice, entity.unitPrice );
+			assertEquals( 10, entity.quantity );
+			assertEquals( "old", entity.status );
+			assertNotNull( entity.updated );
+		} );
+	}
+
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() );
+	}
+
+	@Entity(name="WithDefault")
+	public static class OrderLine {
+		@Id
+		private long id;
+		private BigDecimal unitPrice;
+		private int quantity = 1;
+		@Generated(sql = "'new'")
+		private String status;
+		@Generated(event = {EventType.INSERT, EventType.UPDATE},
+				sql = "current_timestamp")
+		private LocalDateTime updated;
+
+
+		public OrderLine() {}
+		public OrderLine(BigDecimal unitPrice, int quantity) {
+			this.unitPrice = unitPrice;
+			this.quantity = quantity;
+		}
+	}
+}