Skip to content

Commit 0af5bc3

Browse files
Automated commit of generated code
1 parent 82e5555 commit 0af5bc3

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/aggregation/GroupByReceiverImpl.kt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ValueColumn
1414
import org.jetbrains.kotlinx.dataframe.columns.shortPath
1515
import org.jetbrains.kotlinx.dataframe.impl.aggregation.receivers.AggregateInternalDsl
1616
import org.jetbrains.kotlinx.dataframe.impl.api.AggregatedPivot
17+
import org.jetbrains.kotlinx.dataframe.impl.createStarProjectedType
1718
import org.jetbrains.kotlinx.dataframe.impl.createTypeWithArgument
1819
import org.jetbrains.kotlinx.dataframe.impl.getListType
1920
import kotlin.reflect.KType
@@ -118,7 +119,19 @@ internal class GroupByReceiverImpl<T>(override val df: DataFrame<T>, override va
118119
pivot.aggregator.values.clear()
119120
}
120121

121-
is AggregateInternalDsl<*> -> yield(value.copy(value = value.value.df))
122+
is AggregateInternalDsl<*> -> {
123+
// Attempt to create DataFrame<Type> from AggregateInternalDsl<Type>
124+
val dfType = value.type?.arguments?.firstOrNull()?.type
125+
?.let { DataFrame::class.createTypeWithArgument(it) }
126+
?: DataFrame::class.createStarProjectedType(nullable = false)
127+
128+
yield(
129+
value.copy(
130+
value = value.value.df,
131+
type = dfType,
132+
),
133+
)
134+
}
122135

123136
else -> values.add(value)
124137
}

0 commit comments

Comments
 (0)