Skip to content

Commit 82bb7c5

Browse files
committed
Add containsColumn(KProperty)
1 parent 9ac68ad commit 82bb7c5

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/DataFrameGet.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
1414
import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
1515
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
1616
import org.jetbrains.kotlinx.dataframe.columns.UnresolvedColumnsPolicy
17+
import org.jetbrains.kotlinx.dataframe.impl.columnName
1718
import org.jetbrains.kotlinx.dataframe.impl.columns.asAnyFrameColumn
1819
import org.jetbrains.kotlinx.dataframe.impl.columns.toColumns
1920
import org.jetbrains.kotlinx.dataframe.impl.getColumnPaths
2021
import org.jetbrains.kotlinx.dataframe.impl.getColumnsWithPaths
2122
import org.jetbrains.kotlinx.dataframe.indices
2223
import org.jetbrains.kotlinx.dataframe.ncol
2324
import org.jetbrains.kotlinx.dataframe.nrow
25+
import kotlin.reflect.KProperty
2426

2527
public fun <T, C> DataFrame<T>.getColumnsWithPaths(selector: ColumnsSelector<T, C>): List<ColumnWithPath<C>> =
2628
getColumnsWithPaths(UnresolvedColumnsPolicy.Fail, selector)
@@ -80,9 +82,11 @@ public fun <T> ColumnsContainer<T>.getColumnGroupOrNull(name: String): ColumnGro
8082

8183
// region containsColumn
8284

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)
8487

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)
8690

8791
// region rows
8892

0 commit comments

Comments
 (0)