#1073

Author: babyfish-ct

project/gradle.properties

@@ -1,2 +1,2 @@
 group=org.babyfish.jimmer
-version=0.9.92
+version=0.9.93

project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/mutation/SaveCommandTest.kt

@@ -903,45 +903,77 @@ class SaveCommandTest : AbstractMutationTest() {
             }
         }
         executeAndExpectResult({ con ->
-            sqlClient {
-                setDialect(object: H2Dialect() {
+            val sqlClient = sqlClient {
+                setDialect(object : H2Dialect() {
                     override fun isUpsertSupported(): Boolean = false
                 })
                 setIdGenerator(IdentityIdGenerator.INSTANCE)
-            }.entities.forConnection(con).save(author) {
+            }
+            sqlClient.entities.forConnection(con).save(author) {
+                setAssociatedMode(Author::books, AssociatedSaveMode.APPEND_IF_ABSENT)
+            }
+            sqlClient.entities.forConnection(con).save(author) {
                 setAssociatedMode(Author::books, AssociatedSaveMode.APPEND_IF_ABSENT)
             }
         }) {
             statement {
                 sql(
                     """select tb_1_.ID, tb_1_.FIRST_NAME, tb_1_.LAST_NAME 
-                        |from AUTHOR tb_1_ 
-                        |where (tb_1_.FIRST_NAME, tb_1_.LAST_NAME) = (?, ?)""".trimMargin()
+                    |from AUTHOR tb_1_ 
+                    |where (tb_1_.FIRST_NAME, tb_1_.LAST_NAME) = (?, ?)""".trimMargin()
                 )
+                variables("Michael", "Simpson")
             }
             statement {
                 sql(
                     """insert into AUTHOR(FIRST_NAME, LAST_NAME, GENDER) 
-                        |values(?, ?, ?)""".trimMargin()
+                    |values(?, ?, ?)""".trimMargin()
                 )
             }
             statement {
                 sql(
                     """select tb_1_.ID, tb_1_.NAME, tb_1_.EDITION 
-                        |from BOOK tb_1_ 
-                        |where (tb_1_.NAME, tb_1_.EDITION) in ((?, ?), (?, ?))""".trimMargin()
+                    |from BOOK tb_1_ 
+                    |where (tb_1_.NAME, tb_1_.EDITION) in ((?, ?), (?, ?))""".trimMargin()
                 )
             }
             statement {
                 sql(
                     """insert into BOOK(NAME, EDITION, PRICE) 
-                        |values(?, ?, ?)""".trimMargin()
+                    |values(?, ?, ?)""".trimMargin()
                 )
             }
             statement {
                 sql(
                     """insert into BOOK_AUTHOR_MAPPING(AUTHOR_ID, BOOK_ID) 
-                        |values(?, ?)""".trimMargin()
+                    |values(?, ?)""".trimMargin()
+                )
+                batchVariables(0, 100L, 3L)
+            }
+            statement {
+                sql(
+                    """select tb_1_.ID, tb_1_.FIRST_NAME, tb_1_.LAST_NAME 
+                        |from AUTHOR tb_1_ 
+                        |where (tb_1_.FIRST_NAME, tb_1_.LAST_NAME) = (?, ?)""".trimMargin()
+                )
+            }
+            statement {
+                sql(
+                    """update AUTHOR set GENDER = ? where ID = ?"""
+                )
+            }
+            statement {
+                sql(
+                    """select tb_1_.ID, tb_1_.NAME, tb_1_.EDITION 
+                        |from BOOK tb_1_ 
+                        |where (tb_1_.NAME, tb_1_.EDITION) in ((?, ?), (?, ?))""".trimMargin()
+                )
+            }
+            statement {
+                sql(
+                    """select BOOK_ID 
+                        |from BOOK_AUTHOR_MAPPING 
+                        |where AUTHOR_ID = ?""".trimMargin()
                 )
             }
             entity {

project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/PreHandler.java

@@ -984,7 +984,7 @@ void onResolve() {
                             updatedWithoutKeyList.add(draft);
                             items.add(newItem(draft, original));
                         }
-                        if (!ignoreUpdate || ctx.path.getBackProp() != null && !ctx.path.getBackProp().isColumnDefinition()) {
+                        if (!ignoreUpdate || ctx.isIdRetrievingRequired()) {
                             draft.__set(idPropId, original.__get(idPropId));
                         }
                     }

project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/SaveContext.java

@@ -206,4 +206,13 @@ public SaveContext investigator(Executor.BatchContext ctx) {
                 Investigators.toInvestigatorSqlClient(ctx.sqlClient(), ctx)
         );
     }
+
+    public boolean isIdRetrievingRequired() {
+        MutationPath path = this.path;
+        if (path.getParent() == null) {
+            return false;
+        }
+        ImmutableProp backProp = path.getBackProp();
+        return backProp == null || !backProp.isColumnDefinition();
+    }
 }

project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/ast/impl/mutation/Saver.java

@@ -252,7 +252,7 @@ private void fetchIdIfNecessary(List<DraftSpi> drafts, Iterable<Batch<DraftSpi>>
         if (ctx.options.getMode() != SaveMode.INSERT_IF_ABSENT) {
             return;
         }
-        if (ctx.path.getBackProp() == null || ctx.path.getBackProp().isColumnDefinition()) {
+        if (!ctx.isIdRetrievingRequired()) {
             return;
         }
         fetchImpl(drafts, batches, true);
@@ -525,15 +525,14 @@ private void updateAssociations(Batch<DraftSpi> batch, ImmutableProp prop, boole
             if (detach) {
                 switch (ctx.options.getAssociatedMode(prop)) {
                     case APPEND:
-                    case APPEND_IF_ABSENT:
                     case VIOLENTLY_REPLACE:
                         middleTableOperator.append(retainedIdPairs);
                         break;
                     case UPDATE:
                     case MERGE:
                         middleTableOperator.merge(retainedIdPairs);
                         break;
-                    case REPLACE:
+                    default:
                         middleTableOperator.replace(retainedIdPairs);
                         break;
                 }