allow zero dimensional arrays in tables (#425)

rafaqz · Nov 19, 2022 · 70f2aef · 70f2aef
1 parent 1764c38
commit 70f2aef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/DimensionalData.jl b/src/DimensionalData.jl
@@ -35,7 +35,7 @@ include("Dimensions/Dimensions.jl")
 
 using .Dimensions
 using .Dimensions.LookupArrays
-using .Dimensions: StandardIndices, DimOrDimType, DimTuple, DimType, AllDims
+using .Dimensions: StandardIndices, DimOrDimType, DimTuple, DimTupleOrEmpty, DimType, AllDims
 import .LookupArrays: metadata, set, _set, rebuild, basetypeof, 
     order, span, sampling, locus, val, index, bounds, hasselection, units, SelectorOrInterval
 import .Dimensions: dims, refdims, name, lookup, dimstride, kwdims, hasdim, label, _astuple

diff --git a/src/tables.jl b/src/tables.jl
@@ -76,7 +76,7 @@ struct DimArrayColumn{T,A<:AbstractDimArray{T},DS,DL,L} <: AbstractVector{T}
     dimlengths::DL
     length::L
 end
-function DimArrayColumn(A::AbstractDimArray{T}, alldims::DimTuple) where T
+function DimArrayColumn(A::AbstractDimArray{T}, alldims::DimTupleOrEmpty) where T
     # This is the apparent stride for indexing purposes,
     # it is not always the real array stride
     dimstrides = map(d -> dimstride(alldims, d), dims(A))

diff --git a/test/tables.jl b/test/tables.jl
@@ -132,3 +132,11 @@ end
     @test dims(ds) == dims(da)
     @test lookup(ds) == lookup(dims(da))
 end
+
+@testset "zero dimension tables" begin
+    a = DimArray(fill(1), (); name=:a);
+    b = DimArray(fill(2), (); name=:b);
+    ds = DimStack((a, b))
+    @test Tables.columntable(a) == (a = [1],)
+    @test Tables.columntable(ds) == (a = [1], b = [2])
+end