More 0.5 compat

Author: quinnj

src/SQLite.jl

@@ -109,7 +109,7 @@ function bind!{V}(stmt::Stmt, values::Dict{Symbol, V})
         @assert !isempty(name) "nameless parameters should be passed as a Vector"
         # name is returned with the ':', '@' or '$' at the start
         name = name[2:end]
-        bind!(stmt, i, values[symbol(name)])
+        bind!(stmt, i, values[@compat(Symbol)(name)])
     end
 end
 # Binding parameters to SQL statements

src/UDF.jl

@@ -48,6 +48,7 @@ function scalarfunc(func,fsym=symbol(string(func)))
             SQLite.sqlreturn(context, ret)
             nothing
         end
+        return $(nm)
     end
 end
 function scalarfunc(expr::Expr)
@@ -138,6 +139,7 @@ function stepfunc(init, func, fsym=symbol(string(func)*"_step"))
             end
             nothing
         end
+        return $(nm)
     end
 end
 
@@ -177,6 +179,7 @@ function finalfunc(init, func, fsym=symbol(string(func)*"_final"))
             end
             nothing
         end
+        return $(nm)
     end
 end
 
@@ -193,7 +196,7 @@ function register(db, func::Function; nargs::Int=-1, name::AbstractString=string
     nargs < -1 && (nargs = -1)
     @assert sizeof(name) <= 255 "size of function name must be <= 255"
 
-    f = eval(scalarfunc(func,symbol(name)))
+    f = eval(scalarfunc(func,@compat(Symbol)(name)))
 
     cfunc = cfunction(f, Void, (Ptr{Void}, Cint, Ptr{Ptr{Void}}))
     # TODO: allow the other encodings

test/runtests.jl

@@ -25,7 +25,7 @@ results = SQLite.query(db,"SELECT * FROM Employee;")
 @test length(results.data) == 15
 @test size(results) == (8,15)
 @test typeof(results[1,1]) == Nullable{Int}
-@test typeof(results[1,2]) == Nullable{UTF8String}
+@test typeof(results[1,2]) == Nullable{@compat(String)}
 @test isnull(results[1,5])
 
 SQLite.query(db,"SELECT * FROM Album;")
@@ -277,10 +277,10 @@ dt = Data.stream!(source3,Data.Table)
 
 #Make sure we handle undefined values
 db = SQLite.DB() #In case the order of tests is changed
-arr = Array(UTF8String,2) 
+arr = Array(@compat(String),2) 
 arr[1] = "1" #Now an array with the second value undefined
 nv = NullableArrays.NullableArray(arr, [false, true])
-schema = DataStreams.Data.Schema(["nv"], [UTF8String],2)
+schema = DataStreams.Data.Schema(["nv"], [@compat(String)],2)
 d = NullableArrays.NullableVector[nv]
 dt = DataStreams.Data.Table(schema, d,0)
 SQLite.drop!(db, "temp", ifexists=true)
@@ -294,10 +294,10 @@ dt2 = SQLite.query(db, "Select * from temp")
 #Test removeduplicates!
 db = SQLite.DB() #In case the order of tests is changed
 ints = Int64[1,1,2,2,3]
-strs = UTF8String["A", "A", "B", "C", "C"]
+strs = @compat(String)["A", "A", "B", "C", "C"]
 nvInts = NullableArrays.NullableArray(ints)
 nvStrs = NullableArrays.NullableArray(strs)
-schema = DataStreams.Data.Schema(["ints", "strs"], [Int64, UTF8String],5)
+schema = DataStreams.Data.Schema(["ints", "strs"], [Int64, @compat(String)],5)
 d = NullableArrays.NullableVector[nvInts, nvStrs]
 dt = DataStreams.Data.Table(schema, d,0)
 SQLite.drop!(db, "temp", ifexists=true)