#943

babyfish-ct · babyfish-ct · commit 998e40d24266 · 2025-03-10T01:27:08.000+08:00
diff --git a/project/gradle.properties b/project/gradle.properties
@@ -1,2 +1,2 @@
 group=org.babyfish.jimmer
-version=0.9.62
+version=0.9.63
diff --git a/project/jimmer-apt/src/main/java/org/babyfish/jimmer/apt/dto/DtoGenerator.java b/project/jimmer-apt/src/main/java/org/babyfish/jimmer/apt/dto/DtoGenerator.java
@@ -743,7 +743,7 @@ private void addConverterLoading(CodeBlock.Builder cb, DtoProp<ImmutableType, Im
         ImmutableProp baseProp = prop.toTailProp().getBaseProp();
         cb.add(
                 "$T.$L.unwrap().$L",
-                dtoType.getBaseType().getPropsClassName(),
+                baseProp.getDeclaringType().getPropsClassName(),
                 StringUtil.snake(baseProp.getName(), StringUtil.SnakeCase.UPPER),
                 prop.toTailProp().getBaseProp().isAssociation(true) ?
                         "getAssociatedIdConverter(" + forList + ")" :
diff --git a/project/jimmer-ksp/src/main/kotlin/org/babyfish/jimmer/ksp/dto/DtoGenerator.kt b/project/jimmer-ksp/src/main/kotlin/org/babyfish/jimmer/ksp/dto/DtoGenerator.kt
@@ -1561,7 +1561,7 @@ class DtoGenerator private constructor(
         val baseProp: ImmutableProp = prop.toTailProp().getBaseProp()
         add(
             "%T.%L.unwrap().%L",
-            dtoType.baseType.propsClassName,
+            baseProp.declaringType.propsClassName,
             StringUtil.snake(baseProp.name, SnakeCase.UPPER),
             if (prop.toTailProp().getBaseProp()
                     .isAssociation(true)
diff --git a/project/jimmer-sql-kotlin/src/test/dto/Department.dto b/project/jimmer-sql-kotlin/src/test/dto/Department.dto
@@ -25,7 +25,7 @@ DepartmentCompositeView {
             Type(Int::class),
             Type(Int?::class)
         ])
-        name
+        employeeName as name
     }
 }
 
@@ -38,9 +38,7 @@ specification DepartmentSpecification2 {
     id
     flat(employees) {
         valueIn(id) as employeeIds
-        as (^ -> employee) {
-            like/i(name)
-        }
+        like/i(employeeName)
     }
 }
 
diff --git a/project/jimmer-sql-kotlin/src/test/dto/Employee.dto b/project/jimmer-sql-kotlin/src/test/dto/Employee.dto
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.annotation.{JsonSerialize, JsonDeserialize
 import org.babyfish.jimmer.sql.kt.model.hr.{MagicStringSerializer, MagicStringDeserializer}
 
 specification EmployeeSpecificationForIssue735 {
-    like/i(name)
+    like/i(employeeName)
     null(department)
     flat(department) {
         name as departmentName
@@ -19,5 +19,14 @@ input EmployeeInput {
     @JsonSerialize(using = MagicStringSerializer::class)
     @JsonDeserialize(using = MagicStringDeserializer::class)
     @JsonFormat(pattern = "[^%]+")
-    name
+    employeeName as name
+}
+
+input EmployeeInputForIssue943 {
+    #allScalars
+    flat(department) {
+        as (^ -> department) {
+            #allScalars
+        }
+    }
 }
diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/dto/DepartmentViewTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/dto/DepartmentViewTest.kt
@@ -79,8 +79,8 @@ class DepartmentViewTest {
             """{
                 |--->"id":"3",
                 |--->"employees":[
-                |--->--->{"id":"4","name":"Jim"},
-                |--->--->{"id":"5","name":"Kate"}
+                |--->--->{"id":"4","employeeName":"Jim"},
+                |--->--->{"id":"5","employeeName":"Kate"}
                 |--->]
                 |}""".trimMargin(),
             view.toEntity()
@@ -93,11 +93,11 @@ class DepartmentViewTest {
             id = 3L
             employees().addBy {
                 id = 4L
-                name = "Jim"
+                employeeName = "Jim"
             }
             employees().addBy {
                 id = 4L
-                name = "Kate"
+                employeeName = "Kate"
             }
         }
         assertContent(
diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/dto/EmployeeSpecificationTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/dto/EmployeeSpecificationTest.kt
@@ -9,7 +9,7 @@ class EmployeeSpecificationTest : AbstractQueryTest() {
 
     @Test
     fun testParentEmpty() {
-        val spec = EmployeeSpecificationForIssue735(name = "")
+        val spec = EmployeeSpecificationForIssue735(employeeName = "")
         executeAndExpect(
             sqlClient.createQuery(Employee::class) {
                 where(spec)
diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/FilterOuterJoinTest.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/filter/FilterOuterJoinTest.kt
@@ -2,10 +2,7 @@ package org.babyfish.jimmer.sql.kt.filter
 
 import org.babyfish.jimmer.sql.kt.ast.expression.eq
 import org.babyfish.jimmer.sql.kt.common.AbstractQueryTest
-import org.babyfish.jimmer.sql.kt.model.hr.Department
-import org.babyfish.jimmer.sql.kt.model.hr.`employees?`
-import org.babyfish.jimmer.sql.kt.model.hr.fetchBy
-import org.babyfish.jimmer.sql.kt.model.hr.name
+import org.babyfish.jimmer.sql.kt.model.hr.*
 import kotlin.test.Test
 
 class FilterOuterJoinTest : AbstractQueryTest() {
@@ -15,7 +12,7 @@ class FilterOuterJoinTest : AbstractQueryTest() {
         executeAndExpect(
             sqlClient
                 .createQuery(Department::class) {
-                    where(table.asTableEx().`employees?`.name eq "Jessica")
+                    where(table.asTableEx().`employees?`.employeeName eq "Jessica")
                     select(
                         table.fetchBy {
                             name()
diff --git a/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/model/hr/Employee.kt b/project/jimmer-sql-kotlin/src/test/kotlin/org/babyfish/jimmer/sql/kt/model/hr/Employee.kt
@@ -12,7 +12,8 @@ interface Employee {
     @JsonConverter(LongToStringConverter::class)
     val id: Long
 
-    val name: String
+    @Column(name = "NAME")
+    val employeeName: String
 
     @ManyToOne
     @OnDissociate(DissociateAction.DELETE)
diff --git a/project/jimmer-sql/src/test/dto/Administrator.dto b/project/jimmer-sql/src/test/dto/Administrator.dto
@@ -6,3 +6,4 @@ static input AdministratorInputForIssue684 {
         name
     }
 }
+
diff --git a/project/jimmer-sql/src/test/dto/Task.dto b/project/jimmer-sql/src/test/dto/Task.dto
@@ -0,0 +1,9 @@
+export org.babyfish.jimmer.sql.model.wild.Task
+    -> package org.babyfish.jimmer.sql.model.wild.dto
+
+input TaskInputForIssue943 {
+    taskName
+    flat(owner) {
+        name as workerName
+    }
+}
diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/hr/Department.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/hr/Department.java
@@ -19,6 +19,7 @@ public interface Department {
     long id();
 
     @Key
+    @JsonConverter(ConverterForIssue937.class)
     String name();
 
     @LogicalDeleted
diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/inheritance/NamedEntity.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/inheritance/NamedEntity.java
@@ -1,14 +1,17 @@
 package org.babyfish.jimmer.sql.model.inheritance;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.babyfish.jimmer.jackson.JsonConverter;
 import org.babyfish.jimmer.sql.*;
+import org.babyfish.jimmer.sql.model.hr.ConverterForIssue937;
 
 import java.time.LocalDateTime;
 
 @MappedSuperclass
 public interface NamedEntity {
 
     @Key
+    @JsonConverter(ConverterForIssue937.class)
     String getName();
 
     @LogicalDeleted(value = "true")
diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/wild/Task.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/wild/Task.java
@@ -10,7 +10,8 @@ public interface Task {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     long id();
 
-    String name();
+    @Column(name = "NAME")
+    String taskName();
 
     @Nullable
     @ManyToOne
diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/wild/Worker.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/wild/Worker.java
@@ -1,6 +1,8 @@
 package org.babyfish.jimmer.sql.model.wild;
 
+import org.babyfish.jimmer.jackson.JsonConverter;
 import org.babyfish.jimmer.sql.*;
+import org.babyfish.jimmer.sql.model.hr.ConverterForIssue937;
 
 import java.util.List;
 
@@ -12,6 +14,7 @@ public interface Worker {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     long id();
 
+    @JsonConverter(ConverterForIssue937.class)
     String name();
 
     @OneToMany(mappedBy = "owner")
diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/CascadeSaveTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/CascadeSaveTest.java
@@ -1429,22 +1429,22 @@ public void testAppendWildObjects() {
         Worker worker1 = WorkerDraft.$.produce(draft -> {
             draft.setId(1L);
             draft.addIntoTasks(task -> {
-                task.setName("Task-1");
+                task.setTaskName("Task-1");
             });
             draft.addIntoTasks(task -> {
-                task.setName("Task-2");
+                task.setTaskName("Task-2");
             });
             draft.addIntoTasks(task -> {
-                task.setName("Task-3");
+                task.setTaskName("Task-3");
             });
         });
         Worker worker2 = WorkerDraft.$.produce(draft -> {
             draft.setId(2L);
             draft.addIntoTasks(task -> {
-                task.setName("Task-4");
+                task.setTaskName("Task-4");
             });
             draft.addIntoTasks(task -> {
-                task.setName("Task-5");
+                task.setTaskName("Task-5");
             });
         });
 
@@ -1471,9 +1471,9 @@ public void testAppendWildObjects() {
                                 "{" +
                                 "--->\"id\":1," +
                                 "--->\"tasks\":[" +
-                                "--->--->{\"id\":100,\"name\":\"Task-1\",\"owner\":{\"id\":1}}," +
-                                "--->--->{\"id\":101,\"name\":\"Task-2\",\"owner\":{\"id\":1}}," +
-                                "--->--->{\"id\":102,\"name\":\"Task-3\",\"owner\":{\"id\":1}}" +
+                                "--->--->{\"id\":100,\"taskName\":\"Task-1\",\"owner\":{\"id\":1}}," +
+                                "--->--->{\"id\":101,\"taskName\":\"Task-2\",\"owner\":{\"id\":1}}," +
+                                "--->--->{\"id\":102,\"taskName\":\"Task-3\",\"owner\":{\"id\":1}}" +
                                 "--->]" +
                                 "}"
                         );
@@ -1483,8 +1483,8 @@ public void testAppendWildObjects() {
                                 "{" +
                                 "--->\"id\":2," +
                                 "--->\"tasks\":[" +
-                                "--->--->{\"id\":103,\"name\":\"Task-4\",\"owner\":{\"id\":2}}," +
-                                "--->--->{\"id\":104,\"name\":\"Task-5\",\"owner\":{\"id\":2}}" +
+                                "--->--->{\"id\":103,\"taskName\":\"Task-4\",\"owner\":{\"id\":2}}," +
+                                "--->--->{\"id\":104,\"taskName\":\"Task-5\",\"owner\":{\"id\":2}}" +
                                 "--->]" +
                                 "}"
                         );
@@ -1498,13 +1498,13 @@ public void testReplaceWildObjets() {
         Worker worker = WorkerDraft.$.produce(draft -> {
             draft.setId(2L);
             draft.addIntoTasks(task -> {
-                task.setName("Task-1");
+                task.setTaskName("Task-1");
             });
             draft.addIntoTasks(task -> {
-                task.setName("Task-2");
+                task.setTaskName("Task-2");
             });
             draft.addIntoTasks(task -> {
-                task.setName("Task-3");
+                task.setTaskName("Task-3");
             });
         });
         executeAndExpectResult(
@@ -1606,9 +1606,9 @@ public void testSaveOneToOneToNull() {
     @Test
     public void saveIllegalWildParent() {
         Task task = TaskDraft.$.produce(draft -> {
-            draft.setName("Install K8S");
+            draft.setTaskName("Install K8S");
             draft.applyOwner(owner -> {
-                draft.setName("Tim");
+                draft.setTaskName("Tim");
             });
         });
         executeAndExpectResult(
@@ -1643,7 +1643,7 @@ public void saveIllegalWildParent() {
     @Test
     public void saveWildParent() {
         Task task = TaskDraft.$.produce(draft -> {
-            draft.setName("Install K8S");
+            draft.setTaskName("Install K8S");
             draft.applyOwner(owner -> {
                 owner.setName("Tim");
             });
@@ -1668,7 +1668,7 @@ public void saveWildParent() {
                     ctx.entity(it -> {
                         it.modified(
                                 "{" +
-                                "\"id\":108,\"name\":\"Install K8S\"," +
+                                "\"id\":108,\"taskName\":\"Install K8S\"," +
                                 "\"owner\":{\"id\":100,\"name\":\"Tim\"}" +
                                 "}"
                         );
diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/SaveTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/mutation/SaveTest.java
@@ -1336,30 +1336,30 @@ public void testBug525() {
     public void testUpsertWildObjects() {
         Task task1 = TaskDraft.$.produce(draft -> {
             draft.setId(9L);
-            draft.setName("Release binary");
+            draft.setTaskName("Release binary");
             draft.setOwnerId(1L);
         });
         Task task2 = TaskDraft.$.produce(draft -> {
             draft.setId(10L);
-            draft.setName("Create snapshot");
+            draft.setTaskName("Create snapshot");
             draft.setOwnerId(1L);
         });
         Task task3 = TaskDraft.$.produce(draft -> {
             draft.setId(50L);
-            draft.setName("Upgrade database");
+            draft.setTaskName("Upgrade database");
             draft.setOwnerId(1L);
         });
         Task task4 = TaskDraft.$.produce(draft -> {
             draft.setId(51L);
-            draft.setName("Upgrade redis");
+            draft.setTaskName("Upgrade redis");
             draft.setOwnerId(1L);
         });
         Task task5 = TaskDraft.$.produce(draft -> {
-            draft.setName("Setup kafka");
+            draft.setTaskName("Setup kafka");
             draft.setOwnerId(1L);
         });
         Task task6 = TaskDraft.$.produce(draft -> {
-            draft.setName("Setup K8S");
+            draft.setTaskName("Setup K8S");
             draft.setOwnerId(1L);
         });
         executeAndExpectResult(
@@ -1390,10 +1390,10 @@ public void testUpsertWildObjects() {
                     ctx.entity(it -> {});
                     ctx.entity(it -> {});
                     ctx.entity(it -> {
-                        it.modified("{\"id\":100,\"name\":\"Setup kafka\",\"owner\":{\"id\":1}}");
+                        it.modified("{\"id\":100,\"taskName\":\"Setup kafka\",\"owner\":{\"id\":1}}");
                     });
                     ctx.entity(it -> {
-                        it.modified("{\"id\":101,\"name\":\"Setup K8S\",\"owner\":{\"id\":1}}");
+                        it.modified("{\"id\":101,\"taskName\":\"Setup K8S\",\"owner\":{\"id\":1}}");
                     });
                 }
         );
diff --git a/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/SaveWithTriggerTest.java b/project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/trigger/SaveWithTriggerTest.java
@@ -1456,7 +1456,7 @@ public void testSetOnewayReference() {
         );
         assertEvents(
                 "Event{" +
-                        "oldEntity={\"id\":9,\"name\":\"Release package\",\"owner\":null}, " +
+                        "oldEntity={\"id\":9,\"taskName\":\"Release package\",\"owner\":null}, " +
                         "newEntity={\"id\":9,\"owner\":{\"id\":1}}, " +
                         "reason=null" +
                         "}",
@@ -1504,7 +1504,7 @@ public void testUnsetOnewayReference() {
         );
         assertEvents(
                 "Event{" +
-                        "oldEntity={\"id\":10,\"name\":\"Take photo\",\"owner\":{\"id\":2}}, " +
+                        "oldEntity={\"id\":10,\"taskName\":\"Take photo\",\"owner\":{\"id\":2}}, " +
                         "newEntity={\"id\":10,\"owner\":null}, " +
                         "reason=null" +
                         "}",

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`group=org.babyfish.jimmer`
`2`		`-version=0.9.62`
	`2`	`+version=0.9.63`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ DepartmentCompositeView {`
`25`	`25`	`Type(Int::class),`
`26`	`26`	`Type(Int?::class)`
`27`	`27`	`])`
`28`		`- name`
	`28`	`+ employeeName as name`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -38,9 +38,7 @@ specification DepartmentSpecification2 {`
`38`	`38`	`id`
`39`	`39`	`flat(employees) {`
`40`	`40`	`valueIn(id) as employeeIds`
`41`		`- as (^ -> employee) {`
`42`		`- like/i(name)`
`43`		`- }`
	`41`	`+ like/i(employeeName)`
`44`	`42`	`}`
`45`	`43`	`}`
`46`	`44`
Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@ static input AdministratorInputForIssue684 {`
`6`	`6`	`name`
`7`	`7`	`}`
`8`	`8`	`}`
	`9`	`+`