add back check to differentiate scalars from AbstractArrays

JuliaData · Mar 15, 2017 · de280ba · nalimilan · Mar 16, 2017 · cjprybol
1 parent 7310681
commit de280ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/datatable/datatable.jl b/src/datatable/datatable.jl
@@ -102,7 +102,11 @@ type DataTable <: AbstractDataTable
             if isa(c, Range)
                 columns[i] = collect(c)
             elseif !isa(c, AbstractVector)
-                throw(DimensionMismatch("columns must be 1-dimensional"))
+                if isa(c, AbstractArray)
+                    throw(DimensionMismatch("columns must be 1-dimensional"))
+                else
+                    columns[i] = [c]
+                end
             else
                 columns[i] = c
             end

diff --git a/test/constructors.jl b/test/constructors.jl
@@ -65,6 +65,7 @@ module TestConstructors
         @test_throws DimensionMismatch DataTable(a=1, b=[])
         @test_throws DimensionMismatch DataTable(Any[collect(1:10)], DataTables.Index([:A, :B]))
         @test_throws DimensionMismatch DataTable(A = rand(2,2))
+        @test_throws DimensionMismatch DataTable(A = rand(2,1))
     end
 
     @testset "column types" begin