Merge pull request #179 from davidanthoff/update-tests

Update tests to DataFrames v0.11 world

example/05-Nullable.jl

@@ -1,13 +1,11 @@
 using Query
-using TypedTables
 using DataFrames
-using NullableArrays
 
-df = @Table(name=NullableArray(["John", "Sally", "Kirk"]), age=NullableArray([23., 42., 59.]), children=NullableArray([3,5,2]))
+df = DataFrame(name=["John", missing, "Kirk"], age=[23., 42., 59.], children=[3,5,2])
 
 x = @from i in df begin
     @where i.age>30 && i.children >2
-    @select {Name=lowercase(get(i.name))}
+    @select {Name=lowercase(i.name)}
     @collect DataFrame
 end
 

example/08-join.jl

@@ -1,10 +1,10 @@
-using DataFrames, Query, TypedTables
+using DataFrames, Query, IndexedTables
 
 df1 = DataFrame(a=[1,2,3], b=[1.,2.,3.])
-df2 = @Table(c=[2.,4.,2.], d=["John", "Jim","Sally"])
+df2 = table([2.,4.,2.], ["John", "Jim","Sally"], names=[:c,:d])
 
 x = @from i in df1 begin
-    @join j in df2 on get(i.a) equals convert(Int,j.c)
+    @join j in df2 on i.a equals convert(Int,j.c)
     @select {i.a,i.b,j.c,j.d,e="Name: $(j.d)"}
     @collect DataFrame
 end

example/17-groupjoin.jl

@@ -1,10 +1,10 @@
-using DataFrames, Query, TypedTables
+using DataFrames, Query, IndexedTables
 
 df1 = DataFrame(a=[1,2,3], b=[1.,2.,3.])
-df2 = @Table(c=[2.,4.,2.], d=["John", "Jim","Sally"])
+df2 = table([2.,4.,2.], ["John", "Jim","Sally"], names=[:c,:d])
 
 x = @from i in df1 begin
-    @join j in df2 on get(i.a) equals convert(Int,j.c) into k
+    @join j in df2 on i.a equals convert(Int,j.c) into k
     @where i.a>1
     @select {t1=i,t2=k}
     @collect DataFrame

example/19-feather.jl

@@ -1,8 +1,8 @@
-using Query, DataFrames, Feather
+using Query, DataFrames, FileIO, FeatherFiles
 
-testfile = joinpath(Pkg.dir("Feather"),"test", "data", "airquality.feather")
+testfile = joinpath(Pkg.dir("FeatherLib"),"test", "data", "airquality.feather")
 
-results = @from i in Feather.Source(testfile) begin
+results = @from i in load(testfile) begin
     @select i
     @collect DataFrame
 end

example/21-nulls.jl

@@ -1,6 +1,6 @@
-using DataFrames, Query
+using DataFrames, Query, Missings
 
-source_df_nulls = DataFrame(name=@data(["John", "Sally", NA, "Kirk"]), age=[23., 42., 54., 59.], children=@data([3,NA,8,2]))
+source_df_nulls = DataFrame(name=["John", "Sally", missing, "Kirk"], age=[23., 42., 54., 59.], children=[3,missing,8,2])
 q = @from i in source_df_nulls begin
     @select i
     @collect DataFrame

example/23-dict-sink.jl

@@ -4,7 +4,7 @@ using DataFrames
 df = DataFrame(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,5,2])
 
 q = @from i in df begin
-    @select get(i.name)=>get(i.children)
+    @select i.name=>i.children
     @collect Dict
 end
 

example/24-DataTable.jl

@@ -1,12 +1,13 @@
 using Query
-using DataTables
+using IndexedTables
+using DataFrames
 
-dt = DataTable(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,5,2])
+dt = table(@NT(name=["John", "Sally", "Kirk"], age=[23., 42., 59.], children=[3,5,2]))
 
 x = @from i in dt begin
     @where i.age>30. && i.children > 2
     @select {Name=lowercase(i.name)}
-    @collect DataTable
+    @collect DataFrame
 end
 
 println(x)

test/REQUIRE

@@ -1,11 +1,6 @@
 DataFrames
-DataArrays
-DataTables
-TypedTables
-# SQLite
-DataStreams
-CSV
 JSON
-Feather
-NullableArrays
 IndexedTables
+FileIO
+CSVFiles
+FeatherFiles