fix: EXPOSED-669 Review issues

JetBrains · Jan 27, 2025 · bc5e53b · bc5e53b
1 parent 2cc9830
commit bc5e53b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/exposed-core/api/exposed-core.api b/exposed-core/api/exposed-core.api
@@ -2085,7 +2085,6 @@ public final class org/jetbrains/exposed/sql/ResultRow {
 public final class org/jetbrains/exposed/sql/ResultRow$Companion {
 	public final fun create (Ljava/sql/ResultSet;Ljava/util/Map;)Lorg/jetbrains/exposed/sql/ResultRow;
 	public final fun createAndFillDefaults (Ljava/util/List;)Lorg/jetbrains/exposed/sql/ResultRow;
-	public final fun createAndFillFromWrappedValues (Ljava/util/Map;)Lorg/jetbrains/exposed/sql/ResultRow;
 	public final fun createAndFillValues (Ljava/util/Map;)Lorg/jetbrains/exposed/sql/ResultRow;
 }
 

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ResultRow.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ResultRow.kt
@@ -162,13 +162,6 @@ class ResultRow(
             return ResultRow(fieldIndex, values)
         }
 
-        /** Creates a [ResultRow] using the expressions and values provided by [data].
-         *  If the value associated with [ColumnWithTransform] column it will be unwrapped.
-         *  [ResultRow] supposed to store unwrapped values. */
-        fun createAndFillFromWrappedValues(data: Map<Expression<*>, Any?>): ResultRow {
-            return createAndFillValues(unwrapColumnValues(data))
-        }
-
         /** Creates a [ResultRow] storing [columns] with their default or nullable values. */
         fun createAndFillDefaults(columns: List<Column<*>>): ResultRow =
             ResultRow(columns.withIndex().associate { it.value to it.index }).apply {

diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityClass.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityClass.kt
@@ -238,7 +238,7 @@ abstract class EntityClass<ID : Any, out T : Entity<ID>>(
             }
         }.toMap()
 
-        return wrapRow(ResultRow.createAndFillFromWrappedValues(newFieldsMapping))
+        return wrapRow(ResultRow.createAndFillValues(unwrapColumnValues(newFieldsMapping)))
     }
 
     /**
@@ -267,7 +267,7 @@ abstract class EntityClass<ID : Any, out T : Entity<ID>>(
             }
         }.toMap()
 
-        return wrapRow(ResultRow.createAndFillFromWrappedValues(newFieldsMapping))
+        return wrapRow(ResultRow.createAndFillValues(unwrapColumnValues(newFieldsMapping)))
     }
 
     /**
@@ -1172,3 +1172,9 @@ abstract class ImmutableCachedEntityClass<ID : Any, out T : Entity<ID>>(
         expireCache()
     }
 }
+
+internal fun <T : Expression<*>> unwrapColumnValues(values: Map<T, Any?>): Map<T, Any?> = values.mapValues { (col, value) ->
+    if (col !is ExpressionWithColumnType<*>) return@mapValues value
+
+    value?.let { (col.columnType as? ColumnWithTransform<Any, Any>)?.unwrapRecursive(it) } ?: value
+}