Initial work towards 0.6 compat

Author: quinnj

src/Source.jl

@@ -14,8 +14,8 @@ function Source(db::DB, sql::AbstractString, values=[]; rows::Int=-1, stricttype
     bind!(stmt, values)
     status = SQLite.execute!(stmt)
     cols = SQLite.sqlite3_column_count(stmt.handle)
-    header = Array(String, cols)
-    types = Array(DataType, cols)
+    header = Vector{String}(cols)
+    types = Vector{DataType}(cols)
     for i = 1:cols
         header[i] = unsafe_string(SQLite.sqlite3_column_name(stmt.handle, i))
         # do better column type inference; query what the column was created for?

src/consts.jl

@@ -2,25 +2,25 @@ include("../deps/deps.jl")
 
 #Macros
 macro OK(func)
-    :($func == SQLITE_OK)
+    :($(esc(func)) == SQLITE_OK)
 end
 
 macro CHECK(db,ex)
-    quote
+    esc(quote
         if !(@OK $ex)
             sqliteerror($db)
         end
         SQLITE_OK
-    end
+    end)
 end
 
 const SQLNullPtrError = SQLiteException("Cannot operate on null pointer")
 macro NULLCHECK(ptr)
-    quote
+    esc(quote
         if $ptr == C_NULL
             throw(SQLNullPtrError)
         end
-    end
+    end)
 end
 
 #Return codes
@@ -135,7 +135,7 @@ const SQLITE_CONFIG_HEAP =           8 #  /* void*, int nByte, int min */
 const SQLITE_CONFIG_MEMSTATUS =      9 #  /* boolean */
 const SQLITE_CONFIG_MUTEX =         10 #  /* sqlite3_mutex_methods* */
 const SQLITE_CONFIG_GETMUTEX =      11 #  /* sqlite3_mutex_methods* */
-#/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */ 
+#/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */
 const SQLITE_CONFIG_LOOKASIDE =     13 #  /* int int */
 const SQLITE_CONFIG_PCACHE =        14 #  /* no-op */
 const SQLITE_CONFIG_GETPCACHE =     15 #  /* no-op */

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_approx_eq get(i) 3*get(j)
+    @test 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_approx_eq get(r[1,1]) 2*sum(convert(Vector{Float64},s.columns[1]))
+@test get(r[1,1]) - 2*sum(convert(Vector{Float64},s.columns[1])) < 0.02
 
 mycount(p, c) = p + 1
 SQLite.register(db, 0, mycount)
@@ -225,7 +225,7 @@ finalize(db); db = nothing; gc(); gc();
 
 #Make sure we handle undefined values
 db = SQLite.DB() #In case the order of tests is changed
-arr = Array(String,2)
+arr = Vector{String}(2)
 arr[1] = "1" #Now an array with the second value undefined
 dt = DataFrame(Any[NullableArrays.NullableArray(arr, [false, true])])
 SQLite.drop!(db, "temp", ifexists=true)