Skip to content

Commit 2fad96e

Browse files
committed
Add extraColumnsBehavior argument to convertTo
1 parent 66c6aaf commit 2fad96e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ import kotlin.reflect.typeOf
88

99
// region DataFrame
1010

11-
public inline fun <reified T> AnyFrame.convertTo(): DataFrame<T> = convertToImpl(typeOf<T>(), true, org.jetbrains.kotlinx.dataframe.impl.api.ExtraColumns.Remove)
11+
public inline fun <reified T> AnyFrame.convertTo(extraColumnsBehavior: ExtraColumns = ExtraColumns.Keep): DataFrame<T> = convertToImpl(typeOf<T>(), true, extraColumnsBehavior)
1212

1313
// endregion

src/test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person/DataFrameTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,7 +2147,7 @@ class DataFrameTests : BaseTest() {
21472147

21482148
df.convertTo<Target>() shouldBe df
21492149
df.convert { age }.toStr().convertTo<Target>() shouldBe df
2150-
df.add("col") { 1 }.convertTo<Target>() shouldBe df
2150+
df.add("col") { 1 }.convertTo<Target>(ExtraColumns.Remove) shouldBe df
21512151

21522152
val added = df.add("col") { 1 }
21532153
added.convertToImpl<Target>(typeOf<Target>(), allowConversion = true, ExtraColumns.Keep) shouldBe added
@@ -2165,7 +2165,7 @@ class DataFrameTests : BaseTest() {
21652165
}
21662166

21672167
shouldThrow<IllegalArgumentException> {
2168-
df.add("col") { 1 }.convertToImpl<Target>(typeOf<Target>(), allowConversion = true, ExtraColumns.Fail) shouldBe df
2168+
df.add("col") { 1 }.convertTo<Target>(ExtraColumns.Fail) shouldBe df
21692169
}
21702170

21712171
val list = df.toListOf<Target>()

0 commit comments

Comments
 (0)