Skip insert/update for @GeneratedValue annotated fields in @Embedded

data-jdbc/src/test/groovy/io/micronaut/data/jdbc/h2/embeddedAssociation/EmbeddedAssociationJoinSpec.groovy

@@ -3,6 +3,7 @@ package io.micronaut.data.jdbc.h2.embeddedAssociation
 import io.micronaut.context.ApplicationContext
 import io.micronaut.data.annotation.*
 import io.micronaut.data.annotation.repeatable.JoinSpecifications
+import io.micronaut.data.connection.jdbc.advice.DelegatingDataSource
 import io.micronaut.data.jdbc.annotation.JdbcRepository
 import io.micronaut.data.jdbc.h2.H2DBProperties
 import io.micronaut.data.jdbc.h2.H2TestPropertyProvider
@@ -11,6 +12,7 @@ import io.micronaut.data.model.Pageable
 import io.micronaut.data.model.Sort
 import io.micronaut.data.model.query.builder.sql.Dialect
 import io.micronaut.data.repository.CrudRepository
+import io.micronaut.data.repository.GenericRepository
 import io.micronaut.data.repository.jpa.JpaSpecificationExecutor
 import io.micronaut.data.repository.jpa.criteria.PredicateSpecification
 import io.micronaut.data.tck.entities.Order
@@ -21,6 +23,8 @@ import spock.lang.Specification
 
 import jakarta.inject.Inject
 
+import javax.sql.DataSource
+
 @MicronautTest
 @H2DBProperties
 class EmbeddedAssociationJoinSpec extends Specification implements H2TestPropertyProvider {
@@ -40,6 +44,29 @@ class EmbeddedAssociationJoinSpec extends Specification implements H2TestPropert
     @Inject
     OneMainEntityEmRepository oneMainEntityEmRepository = applicationContext.getBean(OneMainEntityEmRepository)
 
+    @Shared
+    @Inject
+    MyMainEntityRepository myMainEntityRepository = applicationContext.getBean(MyMainEntityRepository)
+
+    void setup() {
+        def dataSource = DelegatingDataSource.unwrapDataSource(applicationContext.getBean(DataSource))
+        def connection = dataSource.connection
+        connection.prepareStatement("DROP TABLE IF EXISTS `my_main_entity`").execute()
+        connection.prepareStatement("""
+                                        CREATE TABLE `my_main_entity` (
+                                            `id` bigint primary key not null,
+                                            `value` text,
+                                            `example` text,
+                                            `part_text` text);
+                                         """).execute()
+    }
+
+    void cleanup() {
+        def dataSource = DelegatingDataSource.unwrapDataSource(applicationContext.getBean(DataSource))
+        def connection = dataSource.connection
+        connection.prepareStatement("DROP TABLE IF EXISTS `my_main_entity`")
+    }
+
     void 'test one-to-one update'() {
         given:
             ChildEntity child = new ChildEntity(name: "child")
@@ -122,6 +149,41 @@ class EmbeddedAssociationJoinSpec extends Specification implements H2TestPropert
             oem.id.one.em.assoc[0].name == "C"
             oem.id.one.em.assoc[1].name == "D"
     }
+
+    void 'test save/update embedded with @GeneratedValue'() {
+        when:"should not update field 'example'"
+        myMainEntityRepository.save(new MyMainEntity(id: 1L, example: "Test", value: "Val"))
+        def persistedEntity = myMainEntityRepository.findById(1L).orElse(null)
+        then:
+        persistedEntity
+        persistedEntity.value == "Val"
+        !persistedEntity.example
+        when:
+        myMainEntityRepository.update(new MyMainEntity(id: 1L, example: "Changed", value: "Val-Changed"))
+        def updatedEntity = myMainEntityRepository.findById(1L).orElse(null)
+        then:
+        updatedEntity
+        updatedEntity.value == "Val-Changed"
+        !updatedEntity.example
+
+        when:"should not update field 'part_text'"
+        myMainEntityRepository.save(new MyMainEntity(id: 2L, value: "Val1", part: new MyPart(text: "Test")))
+        persistedEntity = myMainEntityRepository.findById(2L).orElse(null)
+        then:
+        persistedEntity
+        persistedEntity.value == "Val1"
+        !persistedEntity.part.text
+        when:
+        myMainEntityRepository.update(new MyMainEntity(id: 2L, value: "Val2", part: new MyPart(text: "Changed")))
+        updatedEntity = myMainEntityRepository.findById(2L).orElse(null)
+        then:
+        updatedEntity
+        updatedEntity.value == "Val2"
+        !updatedEntity.part.text
+
+        cleanup:
+        myMainEntityRepository.deleteAll()
+    }
 }
 
 @JdbcRepository(dialect = Dialect.H2)
@@ -218,3 +280,35 @@ class MainEntityAssociation {
     Long id
     String name
 }
+
+@MappedEntity("my_main_entity")
+class MyMainEntity {
+
+    @Id
+    Long id
+
+    @GeneratedValue
+    String example
+
+    String value
+
+    @Relation(value = Relation.Kind.EMBEDDED)
+    MyPart part = new MyPart()
+}
+
+@Embeddable
+class MyPart {
+    @GeneratedValue
+    String text
+}
+
+@JdbcRepository(dialect = Dialect.H2)
+interface MyMainEntityRepository extends GenericRepository<MyMainEntity, Long> {
+    Optional<MyMainEntity> findById(Long id)
+
+    MyMainEntity save(MyMainEntity entity)
+
+    MyMainEntity update(MyMainEntity entity)
+
+    void deleteAll()
+}

data-model/src/main/java/io/micronaut/data/model/PersistentEntityUtils.java

@@ -236,6 +236,28 @@ public static Optional<String> getPersistentPropertyPath(PersistentEntity entity
         return entity.getPath(path);
     }
 
+    /**
+     * Checks whether a given property is considered generated based on its annotations and relationship with its owner property.
+     *
+     * @param entity        the persistent entity that owns the property
+     * @param ownerProperty the property that owns the given property. This means
+     *                      when we are doing traversal in case it is an association. If not
+     *                      an association then ownerProperty will be the same as property.
+     * @param property      the property to check
+     * @return true if the property is considered generated, false otherwise
+     */
+    public static boolean isPropertyGenerated(PersistentEntity entity, PersistentProperty ownerProperty, PersistentProperty property) {
+        boolean generated = property.isGenerated();
+        if (generated) {
+            if (ownerProperty instanceof Association association) {
+                generated = association.isEmbedded();
+            } else if (!entity.equals(property.getOwner())) {
+                generated = false;
+            }
+        }
+        return generated;
+    }
+
     private static PersistentProperty getJoinColumnAssocIdentity(PersistentProperty property, PersistentEntity associatedEntity) {
         AnnotationMetadata propertyAnnotationMetadata = property.getAnnotationMetadata();
         AnnotationValue<JoinColumns> joinColumnsAnnotationValue = propertyAnnotationMetadata.getAnnotation(JoinColumns.class);

data-model/src/main/java/io/micronaut/data/model/query/builder/AbstractSqlLikeQueryBuilder.java

@@ -1631,6 +1631,13 @@ public int getParameterIndex() {
                 QueryPropertyPath propertyPath = entry.getKey();
                 if (entry.getValue() instanceof BindingParameter bindingParameter) {
                     traversePersistentProperties(propertyPath.getAssociations(), propertyPath.getProperty(), (associations, property) -> {
+
+                        boolean generated = PersistentEntityUtils.isPropertyGenerated(entity,
+                            propertyPath.getProperty(), property);
+                        if (generated) {
+                            return;
+                        }
+
                         String tableAlias = propertyPath.getTableAlias();
                         if (tableAlias != null) {
                             queryString.append(tableAlias).append(DOT);

data-model/src/main/java/io/micronaut/data/model/query/builder/sql/AbstractSqlLikeQueryBuilder2.java

@@ -791,6 +791,13 @@ public JsonDataType getJsonDataType() {
                 QueryPropertyPath propertyPath = entry.getKey();
                 if (entry.getValue() instanceof BindingParameter bindingParameter) {
                     PersistentEntityUtils.traversePersistentProperties(propertyPath.getPropertyPath(), traverseEmbedded(), (associations, property) -> {
+
+                        boolean generated = PersistentEntityUtils.isPropertyGenerated(entity,
+                            propertyPath.getProperty(), property);
+                        if (generated) {
+                            return;
+                        }
+
                         String tableAlias = propertyPath.getTableAlias();
                         if (tableAlias != null) {
                             queryString.append(tableAlias).append(DOT);

data-model/src/main/java/io/micronaut/data/model/query/builder/sql/SqlQueryBuilder.java

@@ -45,6 +45,7 @@
 import io.micronaut.data.model.Pageable;
 import io.micronaut.data.model.Pageable.Mode;
 import io.micronaut.data.model.PersistentEntity;
+import io.micronaut.data.model.PersistentEntityUtils;
 import io.micronaut.data.model.PersistentProperty;
 import io.micronaut.data.model.PersistentPropertyPath;
 import io.micronaut.data.model.naming.NamingStrategy;
@@ -1026,7 +1027,8 @@ public int getParameterIndex() {
 
             for (PersistentProperty prop : persistentProperties) {
                 traversePersistentProperties(prop, (associations, property) -> {
-                    if (prop.isGenerated()) {
+                    boolean generated = PersistentEntityUtils.isPropertyGenerated(entity, prop, property);
+                    if (generated) {
                         String columnName = getMappedName(namingStrategy, associations, property);
                         if (escape) {
                             columnName = quote(columnName);
@@ -1035,7 +1037,7 @@ public int getParameterIndex() {
                         return;
                     }
 
-                    addWriteExpression(values, prop);
+                    addWriteExpression(values, property);
 
                     String key = String.valueOf(values.size());
                     String[] path = asStringPath(associations, property);

data-model/src/main/java/io/micronaut/data/model/query/builder/sql/SqlQueryBuilder2.java

@@ -861,7 +861,8 @@ public JsonDataType getJsonDataType() {
 
             for (PersistentProperty prop : persistentProperties) {
                 PersistentEntityUtils.traversePersistentProperties(Collections.emptyList(), prop, (associations, property) -> {
-                    if (prop.isGenerated()) {
+                    boolean generated = PersistentEntityUtils.isPropertyGenerated(entity, prop, property);
+                    if (generated) {
                         String columnName = getMappedName(namingStrategy, associations, property);
                         if (escape) {
                             columnName = quote(columnName);
@@ -870,7 +871,7 @@ public JsonDataType getJsonDataType() {
                         return;
                     }
 
-                    addWriteExpression(values, prop);
+                    addWriteExpression(values, property);
 
                     String key = String.valueOf(values.size());
                     String[] path = asStringPath(associations, property);

data-tck/src/main/java/io/micronaut/data/tck/entities/UuidChildEntity.java

@@ -15,15 +15,15 @@
  */
 package io.micronaut.data.tck.entities;
 
-import io.micronaut.data.annotation.GeneratedValue;
+import io.micronaut.data.annotation.AutoPopulated;
 import io.micronaut.data.annotation.Id;
 import io.micronaut.data.annotation.MappedEntity;
 
 import java.util.UUID;
 
 @MappedEntity
 public class UuidChildEntity {
-    @GeneratedValue
+    @AutoPopulated
     @Id
     private UUID uuid;