Skip to content

Commit

Permalink
Merge pull request #23 from queryverse/create-pull-request/patch
Browse files Browse the repository at this point in the history
[AUTO] Format files using DocumentFormat
  • Loading branch information
davidanthoff authored Aug 22, 2020
2 parents ddfd522 + 47ed701 commit ba9312b
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
10 changes: 5 additions & 5 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using Documenter, TableTraitsUtils

makedocs(
modules = [TableTraitsUtils],
sitename = "TableTraitsUtils.jl",
analytics = "UA-132838790-1",
pages = [
modules=[TableTraitsUtils],
sitename="TableTraitsUtils.jl",
analytics="UA-132838790-1",
pages=[
"Introduction" => "index.md"
]
)

deploydocs(
repo = "github.com/queryverse/TableTraitsUtils.jl.git"
repo="github.com/queryverse/TableTraitsUtils.jl.git"
)
2 changes: 1 addition & 1 deletion src/TableTraitsUtils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ end

Base.eltype(::Type{TableIterator{T,TS}}) where {T,TS} = T

@generated function Base.iterate(iter::TableIterator{T,TS}, state = 1) where {T,TS}
@generated function Base.iterate(iter::TableIterator{T,TS}, state=1) where {T,TS}
columns = map(1:length(TS.parameters)) do i
if fieldtype(T, i) <: DataValue && eltype(TS.parameters[i]) >: Missing
return :($(fieldtype(T, i))(iter.columns[$i][state]))
Expand Down
6 changes: 3 additions & 3 deletions src/collect1.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Main entry point
function create_columns_from_iterabletable(itr; sel_cols = :all, na_representation = :datavalue, errorhandling = :error)
function create_columns_from_iterabletable(itr; sel_cols=:all, na_representation=:datavalue, errorhandling=:error)
in(errorhandling, (:error, :returnvalue)) || throw(ArgumentError("'$errorhandling' is not a valid argument for errorhandling."))
in(na_representation, (:datavalue, :missing)) || throw(ArgumentError("'$na_representation' is not a valid argument for na_representation."))

Expand All @@ -12,15 +12,15 @@ function create_columns_from_iterabletable(itr; sel_cols = :all, na_representati
else

array_factory = if na_representation == :datavalue
(t, rows)->begin
(t, rows) -> begin
if t <: DataValue
return DataValueArray{eltype(t)}(rows)
else
return Array{t}(undef, rows)
end
end
elseif na_representation == :missing
(t, rows)->begin
(t, rows) -> begin
if t <: DataValue
return Array{Union{eltype(t),Missing}}(undef, rows)
else
Expand Down
34 changes: 17 additions & 17 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ include("test_source_without_length.jl")
@testset "TableTraitsUtils" begin

@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(nothing)
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(nothing, errorhandling = :error)
@test TableTraitsUtils.create_columns_from_iterabletable(nothing, errorhandling = :returnvalue) === nothing
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(nothing, errorhandling=:error)
@test TableTraitsUtils.create_columns_from_iterabletable(nothing, errorhandling=:returnvalue) === nothing

@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable([1,2,3])
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable([1,2,3], errorhandling = :error)
@test TableTraitsUtils.create_columns_from_iterabletable([1,2,3], errorhandling = :returnvalue) === nothing
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable([1,2,3], errorhandling=:error)
@test TableTraitsUtils.create_columns_from_iterabletable([1,2,3], errorhandling=:returnvalue) === nothing

@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i->true, [1,2,3]))
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i->true, [1,2,3]), errorhandling = :error)
@test TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i->true, [1,2,3]), errorhandling = :returnvalue) === nothing
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1,2,3]))
@test_throws ArgumentError TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1,2,3]), errorhandling=:error)
@test TableTraitsUtils.create_columns_from_iterabletable(Iterators.filter(i -> true, [1,2,3]), errorhandling=:returnvalue) === nothing

@test create_columns_from_iterabletable(NamedTuple{(:a, :b),Tuple{Int,String}}[]) == (Any[Int[],String[]], [:a,:b])
@test create_columns_from_iterabletable((i for i in NamedTuple{(:a, :b),Tuple{Int,String}}[])) == (Any[Int[],String[]], [:a,:b])

@test_throws ArgumentError create_columns_from_iterabletable(Int[])
@test_throws ArgumentError create_columns_from_iterabletable(Int[], errorhandling = :error)
@test create_columns_from_iterabletable(Int[], errorhandling = :returnvalue) === nothing
@test_throws ArgumentError create_columns_from_iterabletable(Int[], errorhandling=:error)
@test create_columns_from_iterabletable(Int[], errorhandling=:returnvalue) === nothing
@test_throws ArgumentError create_columns_from_iterabletable((i for i in Int[]))
@test_throws ArgumentError create_columns_from_iterabletable((i for i in Int[]), errorhandling = :error)
@test create_columns_from_iterabletable((i for i in Int[]), errorhandling = :returnvalue) === nothing
@test_throws ArgumentError create_columns_from_iterabletable((i for i in Int[]), errorhandling=:error)
@test create_columns_from_iterabletable((i for i in Int[]), errorhandling=:returnvalue) === nothing

columns = (Int[1,2,3], Float64[1.,2.,3.], String["John", "Sally", "Drew"])
names = [:children, :age, :name]
Expand All @@ -35,9 +35,9 @@ include("test_source_without_length.jl")

columns2, names2 = TableTraitsUtils.create_columns_from_iterabletable(it)

columns3, names3 = TableTraitsUtils.create_columns_from_iterabletable(it, sel_cols = :all)
columns3, names3 = TableTraitsUtils.create_columns_from_iterabletable(it, sel_cols=:all)

columns23, names23 = TableTraitsUtils.create_columns_from_iterabletable(it, sel_cols = [2,3])
columns23, names23 = TableTraitsUtils.create_columns_from_iterabletable(it, sel_cols=[2,3])

@test columns[1] == columns2[1] == columns3[1]
@test columns[2] == columns2[2] == columns3[2]
Expand All @@ -50,11 +50,11 @@ include("test_source_without_length.jl")
@test names == names2 == names3
@test names[2:3] == names23

@test isequal(create_columns_from_iterabletable([(a = DataValue{Any}(), b = DataValue{Int}())], na_representation = :missing),
@test isequal(create_columns_from_iterabletable([(a = DataValue{Any}(), b = DataValue{Int}())], na_representation=:missing),
([Any[missing], Union{Missing,Int}[missing]], [:a, :b])
)

@test create_columns_from_iterabletable([(a = DataValue{Any}(), b = DataValue{Int}())], na_representation = :datavalue) ==
@test create_columns_from_iterabletable([(a = DataValue{Any}(), b = DataValue{Int}())], na_representation=:datavalue) ==
([DataValue{Any}[NA], DataValue{Int}[NA]], [:a, :b])

it2 = TestSourceWithoutLength()
Expand All @@ -64,12 +64,12 @@ include("test_source_without_length.jl")
@test columns4[2] == [1.,2.]
@test names4 == [:a, :b]

columns5, names5 = TableTraitsUtils.create_columns_from_iterabletable(it2, sel_cols = :all)
columns5, names5 = TableTraitsUtils.create_columns_from_iterabletable(it2, sel_cols=:all)
@test columns5[1] == [1,2]
@test columns5[2] == [1.,2.]
@test names5 == [:a, :b]

columns6, names6 = TableTraitsUtils.create_columns_from_iterabletable(it2, sel_cols = [2])
columns6, names6 = TableTraitsUtils.create_columns_from_iterabletable(it2, sel_cols=[2])
@test columns6[1] == [1.,2.]
@test names6 == [:b]

Expand Down
2 changes: 1 addition & 1 deletion test/test_source_without_length.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ end

Base.IteratorSize(::Type{T}) where {T <: TestSourceWithoutLength} = Base.SizeUnknown()

function Base.iterate(iter::TestSourceWithoutLength, state = 1)
function Base.iterate(iter::TestSourceWithoutLength, state=1)
if state == 1
return (a = 1, b = 1.), 2
elseif state == 2
Expand Down

0 comments on commit ba9312b

Please sign in to comment.