From 984457e355ed8559df29bf872e4c2f956ffbde05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogumi=C5=82=20Kami=C5=84ski?= Date: Thu, 13 Feb 2020 13:48:29 +0100 Subject: [PATCH] Add missing required changes --- src/other/tables.jl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/other/tables.jl b/src/other/tables.jl index c6e9973a93..2a4ba03b13 100644 --- a/src/other/tables.jl +++ b/src/other/tables.jl @@ -7,8 +7,16 @@ Tables.rows(df::AbstractDataFrame) = Tables.rows(columntable(df)) Tables.schema(df::AbstractDataFrame) = Tables.Schema(names(df), eltype.(eachcol(df))) Tables.materializer(df::AbstractDataFrame) = DataFrame +Tables.getcolumn(df::AbstractDataFrame, i::Int) = df[!, i] +Tables.getcolumn(df::AbstractDataFrame, nm::Symbol) = df[!, nm] +Tables.columnnames(df::AbstractDataFrame) = names(df) + +Tables.getcolumn(dfr::DataFrameRow, i::Int) = dfr[i] +Tables.getcolumn(dfr::DataFrameRow, nm::Symbol) = dfr[nm] +Tables.columnnames(dfr::DataFrameRow) = names(dfr) + getvector(x::AbstractVector) = x -getvector(x) = collect(x) +getvector(x) = [x[i] for i = 1:length(x)] # note that copycols is ignored in this definition (Tables.CopiedColumns implies copies have already been made) fromcolumns(x::Tables.CopiedColumns, names; copycols::Bool=true) = DataFrame(AbstractVector[getvector(Tables.getcolumn(x, nm)) for nm in names],