Fix tests and 0.6/0.7 compat

Author: quinnj

src/SQLite.jl

@@ -4,6 +4,11 @@ module SQLite
 using Missings, DataStreams, WeakRefStrings, LegacyStrings, DataFrames
 import LegacyStrings: UTF16String
 
+if VERSION < v"0.7.0-DEV.2562"
+    import Base: finalizer
+    finalizer(f::Function, o) = finalizer(o, f)
+end
+
 export Data, DataFrame
 
 struct SQLiteException <: Exception
@@ -38,7 +43,7 @@ mutable struct DB
         f = isempty(f) ? f : expanduser(f)
         if @OK sqliteopen(f, handle)
             db = new(f, handle[], 0)
-            finalizer(db, _close)
+            finalizer(_close, db)
             return db
         else # error
             sqlite3_close(handle[])
@@ -67,7 +72,7 @@ mutable struct Stmt
         handle = Ref{Ptr{Void}}()
         sqliteprepare(db, sql, handle, Ref{Ptr{Void}}())
         stmt = new(db, handle[])
-        finalizer(stmt, _close)
+        finalizer(_close, stmt)
         return stmt
     end
 end
@@ -182,7 +187,7 @@ end
 
 # magic bytes that indicate that a value is in fact a serialized julia value, instead of just a byte vector
 # const SERIALIZATION = UInt8[0x11,0x01,0x02,0x0d,0x53,0x65,0x72,0x69,0x61,0x6c,0x69,0x7a,0x61,0x74,0x69,0x6f,0x6e,0x23]
-if VERSION < v"0.7-dev"
+if VERSION < v"0.7.0-DEV.1833"
     const SERIALIZATION = UInt8[0x34,0x10,0x01,0x0d,0x53,0x65,0x72,0x69,0x61,0x6c,0x69,0x7a,0x61,0x74,0x69,0x6f,0x6e,0x1f]
 else
     const SERIALIZATION = UInt8[0x37,0x4a,0x4c,0x07,0x04,0x00,0x00,0x00,0x34,0x10,0x01,0x0d,0x53,0x65,0x72,0x69,0x61,0x6c]

test/runtests.jl

@@ -1,6 +1,12 @@
 using SQLite
 using Base.Test, Missings, WeakRefStrings, DataStreams, DataFrames
 
+if Base.VERSION < v"0.7.0-DEV.2575"
+    const Dates = Base.Dates
+else
+    import Dates
+end
+
 import Base: +, ==
 
 dbfile = joinpath(dirname(@__FILE__),"Chinook_Sqlite.sqlite")
@@ -45,17 +51,17 @@ r = SQLite.query(db,"select * from temp limit 10")
 @test all(Bool[x == 2014 for x in r[4]])
 @test length(SQLite.query(db,"alter table temp add column dates blob")) == 0
 stmt = SQLite.Stmt(db,"update temp set dates = ?")
-SQLite.bind!(stmt,1,Date(2014,1,1))
+SQLite.bind!(stmt,1,Dates.Date(2014,1,1))
 SQLite.execute!(stmt)
 finalize(stmt); stmt = nothing; gc()
 r = SQLite.query(db,"select * from temp limit 10")
 @test length(r) == 5
 @test size(Data.schema(r)) == (10,5)
-@test typeof(r[5][1]) == Date
-@test all(Bool[x == Date(2014,1,1) for x in r[5]])
+@test typeof(r[5][1]) == Dates.Date
+@test all(Bool[x == Dates.Date(2014,1,1) for x in r[5]])
 @test length(SQLite.query(db,"drop table temp")) == 0
 
-dt = DataFrame(eye(5))
+dt = DataFrame([1.0 0.0 0.0 0.0 0.0; 0.0 1.0 0.0 0.0 0.0; 0.0 0.0 1.0 0.0 0.0; 0.0 0.0 0.0 1.0 0.0; 0.0 0.0 0.0 0.0 1.0])
 sink = SQLite.Sink(db, "temp", Data.schema(dt))
 SQLite.load(sink, dt)
 r = SQLite.query(db,"select * from $(sink.tablename)")
@@ -92,14 +98,14 @@ r = SQLite.query(db, "select * from $(sink.tablename)")
 @test all([typeof(i) for i in r[1]] .== Float64)
 SQLite.drop!(db, "$(sink.tablename)")
 
-rng = Date(2013):Dates.Day(1):Date(2013,1,5)
+rng = Dates.Date(2013):Dates.Day(1):Dates.Date(2013,1,5)
 dt = DataFrame(i=collect(rng), j=collect(rng))
 sink = SQLite.Sink(db, "temp", Data.schema(dt))
 SQLite.load(sink, dt)
 r = SQLite.query(db, "select * from $(sink.tablename)")
 @test size(Data.schema(r)) == (5,2)
 @test all([i for i in r[1]] .== rng)
-@test all([typeof(i) for i in r[1]] .== Date)
+@test all([typeof(i) for i in r[1]] .== Dates.Date)
 SQLite.drop!(db, "$(sink.tablename)")
 
 SQLite.query(db, "CREATE TABLE temp AS SELECT * FROM Album")