@@ -14,13 +14,15 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
14
14
import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
15
15
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
16
16
import org.jetbrains.kotlinx.dataframe.columns.UnresolvedColumnsPolicy
17
+ import org.jetbrains.kotlinx.dataframe.impl.columnName
17
18
import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn
18
19
import org.jetbrains.kotlinx.dataframe.impl.columns.toColumns
19
20
import org.jetbrains.kotlinx.dataframe.impl.getColumnPaths
20
21
import org.jetbrains.kotlinx.dataframe.impl.getColumnsWithPaths
21
22
import org.jetbrains.kotlinx.dataframe.indices
22
23
import org.jetbrains.kotlinx.dataframe.ncol
23
24
import org.jetbrains.kotlinx.dataframe.nrow
25
+ import kotlin.reflect.KProperty
24
26
25
27
public fun <T , C > DataFrame<T>.getColumnsWithPaths (selector : ColumnsSelector <T , C >): List <ColumnWithPath <C >> =
26
28
getColumnsWithPaths(UnresolvedColumnsPolicy .Fail , selector)
@@ -80,9 +82,11 @@ public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(name: String): ColumnGro
80
82
81
83
// region containsColumn
82
84
83
- public fun <T > ColumnsContainer<T>.containsColumn (column : Column ): Boolean = containsColumn(column.path())
85
+ public fun ColumnsContainer <* >.containsColumn (column : Column ): Boolean = containsColumn(column.path())
86
+ public fun ColumnsContainer <* >.containsColumn (column : KProperty <* >): Boolean = containsColumn(column.columnName)
84
87
85
- public operator fun <T > ColumnsContainer<T>.contains (column : Column ): Boolean = containsColumn(column)
88
+ public operator fun ColumnsContainer <* >.contains (column : Column ): Boolean = containsColumn(column)
89
+ public operator fun ColumnsContainer <* >.contains (column : KProperty <* >): Boolean = containsColumn(column)
86
90
87
91
// region rows
88
92
0 commit comments