Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ class PyDatasetBuilder(private val builder: DatasetBuilder) : PyObject() {
}

fun colTypes(vararg types: PyObject) = apply {
builder.colTypes(types.map { it.asJavaClass() })
if (types.singleOrNull()?.isSequenceType == true) {
builder.colTypes(types.first().asIterable().map { it.asJavaClass() })
} else {
builder.colTypes(types.map { it.asJavaClass() })
}
}

fun colTypes(types: List<Class<*>>) = apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import kotlin.io.path.writeBytes
class DatasetExtensionsTests : JythonTest(
{ globals ->
globals["utils"] = DatasetExtensions
globals["builder"] = DatasetBuilder.newBuilder()
globals["dataset"] = DatasetBuilder.newBuilder()
.colNames("a", "b", "c")
.colTypes(Int::class.javaObjectType, Double::class.javaObjectType, String::class.java)
Expand Down Expand Up @@ -540,6 +541,16 @@ class DatasetExtensionsTests : JythonTest(
)
}
}

test("Column types regression (issue #24)") {
eval<Dataset>(
"""
builder.colNames(dataset.columnNames) \
.colTypes(dataset.columnTypes) \
.build()
""".trimIndent(),
)
}
}
}
}