bug fixed

Author: vincentlauvlwj

ktorm-core/src/main/kotlin/me/liuwj/ktorm/entity/EntityDml.kt

@@ -112,6 +112,10 @@ private fun EntityImplementation.findChangedColumns(fromTable: Table<*>): Map<Co
                 var curr: Any? = this
 
                 for ((i, prop) in binding.withIndex()) {
+                    if (curr is Entity<*>) {
+                        curr = curr.implementation
+                    }
+
                     check(curr is EntityImplementation?)
 
                     val changed = if (curr == null) false else prop.name in curr.changedProperties
@@ -126,11 +130,7 @@ private fun EntityImplementation.findChangedColumns(fromTable: Table<*>): Map<Co
                     }
 
                     anyChanged = anyChanged || changed
-
                     curr = curr?.getProperty(prop.name)
-                    if (curr is Entity<*>) {
-                        curr = curr.implementation
-                    }
                 }
 
                 if (anyChanged) {
@@ -169,14 +169,13 @@ internal fun EntityImplementation.doDiscardChanges() {
                     if (curr == null) {
                         break
                     }
+                    if (curr is Entity<*>) {
+                        curr = curr.implementation
+                    }
 
                     check(curr is EntityImplementation)
                     curr.changedProperties.remove(prop.name)
-
                     curr = curr.getProperty(prop.name)
-                    if (curr is Entity<*>) {
-                        curr = curr.implementation
-                    }
                 }
             }
         }

ktorm-core/src/main/kotlin/me/liuwj/ktorm/entity/EntityExtensions.kt

@@ -54,7 +54,7 @@ internal fun EntityImplementation.setColumnValue(column: Column<*>, value: Any?)
                 if (i != binding.lastIndex) {
                     var child = curr.getProperty(prop.name) as Entity<*>?
                     if (child == null) {
-                        child = Entity.create(prop.returnType.classifier as KClass<*>, parent = curr, fromTable = column.table)
+                        child = Entity.create(prop.returnType.classifier as KClass<*>, parent = curr)
                         curr.setProperty(prop.name, child)
                     }
 
@@ -91,7 +91,7 @@ internal fun EntityImplementation.forceSetColumnValue(column: Column<*>, value:
                 if (i != binding.lastIndex) {
                     var child = curr.getProperty(prop.name) as Entity<*>?
                     if (child == null) {
-                        child = Entity.create(prop.returnType.classifier as KClass<*>, parent = curr, fromTable = column.table)
+                        child = Entity.create(prop.returnType.classifier as KClass<*>, parent = curr)
                         curr.setProperty(prop.name, child, forceSet = true)
                     }
 

ktorm-core/src/main/kotlin/me/liuwj/ktorm/entity/EntityFinding.kt

@@ -1,9 +1,11 @@
 package me.liuwj.ktorm.entity
 
 import me.liuwj.ktorm.dsl.*
-import me.liuwj.ktorm.expression.*
+import me.liuwj.ktorm.expression.BinaryExpression
+import me.liuwj.ktorm.expression.BinaryExpressionType
+import me.liuwj.ktorm.expression.QuerySourceExpression
+import me.liuwj.ktorm.expression.ScalarExpression
 import me.liuwj.ktorm.schema.*
-import kotlin.reflect.KClass
 
 /**
  * 根据 ID 批量获取实体对象，会自动 left join 所有的引用表
@@ -145,22 +147,8 @@ private fun QueryRowSet.retrieveColumn(column: Column<*>, intoEntity: Entity<*>)
         }
         is NestedBinding -> {
             val columnValue = if (this.hasColumn(column)) this[column] else null
-
             if (columnValue != null) {
-                var curr = intoEntity.implementation
-                for ((i, prop) in binding.withIndex()) {
-                    if (i != binding.lastIndex) {
-                        var child = curr.getProperty(prop.name) as Entity<*>?
-                        if (child == null) {
-                            child = Entity.create(prop.returnType.classifier as KClass<*>, parent = curr)
-                            curr.setProperty(prop.name, child)
-                        }
-
-                        curr = child.implementation
-                    }
-                }
-
-                curr.setProperty(binding.last().name, columnValue)
+                intoEntity.implementation.setColumnValue(column, columnValue)
             }
         }
     }