Add back support for 0.5 and changes tests to work on 0.5 or 0.6

Author: quinnj

.travis.yml

@@ -8,6 +8,7 @@ os:
 
 julia:
   - 0.5
+  - nightly
 
 notifications:
   email: false

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.5 0.6
+julia 0.5
 BinDeps
 @osx Homebrew
 @windows WinRPM

appveyor.yml

@@ -2,6 +2,8 @@ environment:
   matrix:
   - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
   - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
+  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 
 branches:
   only:

src/Sink.jl

@@ -102,12 +102,12 @@ Load a Data.Source `source` into an SQLite table that will be named `tablename`
 `temp=true` will create a temporary SQLite table that will be destroyed automatically when the database is closed
 `ifnotexists=false` will throw an error if `tablename` already exists in `db`
 """
-function load{T}(db, name, ::Type{T}, args...; append::Bool=false, transforms::Dict=Dict{Int,Function}(), kwargs...)
+function load{T}(db::SQLite.DB, name, ::Type{T}, args...; append::Bool=false, transforms::Dict=Dict{Int,Function}(), kwargs...)
     sink = Data.stream!(T(args...), SQLite.Sink, append, transforms, db, name; kwargs...)
     Data.close!(sink)
     return sink
 end
-function load{T}(db, name, source::T; append::Bool=false, transforms::Dict=Dict{Int,Function}(), kwargs...)
+function load{T}(db::SQLite.DB, name, source::T; append::Bool=false, transforms::Dict=Dict{Int,Function}(), kwargs...)
     sink = Data.stream!(source, SQLite.Sink, append, transforms, db, name; kwargs...)
     Data.close!(sink)
     return sink

test/datastreams.jl

@@ -53,12 +53,18 @@ function DataFrame(sink, sch::Data.Schema, ::Type{Data.Field}, append::Bool, ref
 end
 
 # SQLite
-dbfile = joinpath(DSTESTDIR, "randoms.sqlite")
+dbfile = joinpath(dirname(@__FILE__), "randoms.sqlite")
 dbfile2 = joinpath(dirname(@__FILE__),"test2.sqlite")
+db = SQLite.DB(dbfile)
+SQLite.load(db, "randoms_small", DF)
 cp(dbfile, dbfile2; remove_destination=true)
 db2 = SQLite.DB(dbfile2)
 SQLite.createtable!(db2, "randoms2_small", Data.schema(SQLite.Source(db2, "select * from randoms_small")))
 sqlitesource = Tester("SQLite.Source", SQLite.query, true, SQLite.Source, (db2, "select * from randoms_small"), scalartransforms, vectortransforms, x->x, ()->nothing)
 sqlitesink = Tester("SQLite.Sink", SQLite.load, true, SQLite.Sink, (db2, "randoms2_small"), scalartransforms, vectortransforms, x->SQLite.query(db2, "select * from randoms2_small"), (x,y)->nothing)
 
 DataStreamsIntegrationTests.teststream([dfsource, sqlitesource], [dfsink, sqlitesink]; rows=99)
+db = db2 = nothing;
+gc(); gc();
+rm(dbfile)
+rm(dbfile2)

test/runtests.jl

@@ -139,7 +139,7 @@ SQLite.register(db, triple, nargs=1)
 r = SQLite.query(db, "SELECT triple(Total) FROM Invoice ORDER BY InvoiceId LIMIT 5")
 s = SQLite.query(db, "SELECT Total FROM Invoice ORDER BY InvoiceId LIMIT 5")
 for (i, j) in zip(r.columns[1], s.columns[1])
-    @test get(i) - 3*get(j) < 0.02
+    @test abs(get(i) - 3*get(j)) < 0.02
 end
 
 SQLite.@register db function add4(q)
@@ -177,7 +177,7 @@ doublesum_final(persist) = 2 * persist
 SQLite.register(db, 0, doublesum_step, doublesum_final, name="doublesum")
 r = SQLite.query(db, "SELECT doublesum(UnitPrice) FROM Track")
 s = SQLite.query(db, "SELECT UnitPrice FROM Track")
-@test get(r[1,1]) - 2*sum(convert(Vector{Float64},s.columns[1])) < 0.02
+@test abs(get(r[1,1]) - 2*sum(convert(Vector{Float64},s.columns[1]))) < 0.02
 
 mycount(p, c) = p + 1
 SQLite.register(db, 0, mycount)