Merge branch 'master' of git://github.com/quinnj/SQLite.jl

Author: quinnj

src/UDF.jl

@@ -1,8 +1,12 @@
 # scalar functions
 function registerfunc(db::SQLiteDB, nargs::Integer, func::Function, isdeterm::Bool=true; name="")
-    @assert (-1 <= nargs <= 127) "nargs must follow the inequality -1 <= nargs <= 127"
+    @assert nargs <= 127 "only varargs functions can have more than 127 arguments"
+    # assume any negative number means a varargs function
+    nargs < -1 && (nargs = -1)
 
     name = isempty(name) ? string(func) : name::String
+    @assert sizeof(name) <= 255 "size of function name must be <= 255"
+
     cfunc = cfunction(func, Nothing, (Ptr{Void}, Cint, Ptr{Ptr{Void}}))
 
     # TODO: allow the other encodings
@@ -16,7 +20,9 @@ end
 
 # aggregate functions
 function registerfunc(db::SQLiteDB, nargs::Integer, step::Function, final::Function, isdeterm::Bool=true; name="")
-    @assert (-1 <= nargs <= 127) "nargs must follow the inequality -1 <= nargs <= 127"
+    @assert nargs <= 127 "only varargs functions can have more than 127 arguments"
+    # assume any negative number means a varargs function
+    nargs < -1 && (nargs = -1)
 
     name = isempty(name) ? string(step) : name::String
     cstep = cfunction(step, Nothing, (Ptr{Void}, Cint, Ptr{Ptr{Void}}))
@@ -93,7 +99,6 @@ macro scalarfunc(args...)
     end
 end
 
-
 # annotate types because the MethodError makes more sense that way
 @scalarfunc regexp(r::String, s::String) = ismatch(Regex(r), s)
 # macro for preserving the special characters in a string

src/api.jl

@@ -296,6 +296,7 @@ function sqlite3_create_function_v2(db::Ptr{Void},name::String,nargs::Integer,
                                     enc::Integer,data::Ptr{Void},func::Ptr{Void},
                                     step::Ptr{Void},final::Ptr{Void},
                                     destructor::Ptr{Void})
+    @NULLCHECK db
     return ccall(
         (:sqlite3_create_function_v2, sqlite3_lib),
         Cint,

test/runtests.jl

@@ -111,7 +111,6 @@ r = query(db, sr"SELECT LastName FROM Employee WHERE BirthDate REGEXP '^\d{4}-08
     x * 3
 end
 @test_throws ErrorException registerfunc(db, 186, triple)
-@test_throws ErrorException registerfunc(db, -2, triple)
 registerfunc(db, 1, triple)
 r = query(db, "SELECT triple(Total) FROM Invoice ORDER BY InvoiceId LIMIT 5")
 s = query(db, "SELECT Total FROM Invoice ORDER BY InvoiceId LIMIT 5")