decouple from tables

Author: Pietro Vertechi

src/tables.jl

@@ -2,7 +2,6 @@ Tables.isrowtable(::Type{<:StructArray}) = true
 
 Tables.columnaccess(::Type{<:StructArray}) = true
 Tables.columns(s::StructArray) = fieldarrays(s)
-Tables.getcolumn(s::StructArray, i::Int) = getproperty(s, i)
 Tables.schema(s::StructArray) = Tables.Schema(staticschema(eltype(s)))
 
 function Base.append!(s::StructVector, rows)

src/utils.jl

@@ -21,6 +21,13 @@ function buildfromschema(initializer, ::Type{T}, ::Type{NT}) where {T, NT<:Tup}
     StructArray{T}(nt)
 end
 
+@static if VERSION < v"1.2.0"
+    @inline _getproperty(v::Tuple, field) = getfield(v, field)
+    @inline _getproperty(v, field) = getproperty(v, field)
+else
+    const _getproperty = getproperty
+end
+
 function _foreachfield(names, L)
     vars = ntuple(i -> gensym(), L)
     exprs = Expr[]
@@ -29,7 +36,7 @@ function _foreachfield(names, L)
     end
     for field in names
         sym = QuoteNode(field)
-        args = [Expr(:call, :getcolumn, var, sym) for var in vars]
+        args = [Expr(:call, :_getproperty, var, sym) for var in vars]
         push!(exprs, Expr(:call, :f, args...))
     end
     push!(exprs, :(return nothing))

test/runtests.jl

@@ -336,10 +336,10 @@ end
     @test Tables.rowaccess(typeof(s))
     @test Tables.columnaccess(s)
     @test Tables.columnaccess(typeof(s))
-    @test Tables.getcolumn(s, 1) == [1]
-    @test Tables.getcolumn(s, :a) == [1]
-    @test Tables.getcolumn(s, 2) == ["test"]
-    @test Tables.getcolumn(s, :b) == ["test"]
+    @test Tables.getcolumn(Tables.columns(s), 1) == [1]
+    @test Tables.getcolumn(Tables.columns(s), :a) == [1]
+    @test Tables.getcolumn(Tables.columns(s), 2) == ["test"]
+    @test Tables.getcolumn(Tables.columns(s), :b) == ["test"]
     @test append!(StructArray([1im]), [(re = 111, im = 222)]) ==
         StructArray([1im, 111 + 222im])
     @test append!(StructArray([1im]), (x for x in [(re = 111, im = 222)])) ==