Export sqlreturn and check nargs in registerfunc.

Sean1708 · Sean1708 · commit b635c51bf400 · 2014-10-13T17:09:24.000+01:00
diff --git a/src/SQLite.jl b/src/SQLite.jl
@@ -31,7 +31,7 @@ end
 SQLiteDB(file,handle) = SQLiteDB(file,handle,0)
 
 include("UDF.jl")
-export registerfunc, @scalarfunc, @sr_str
+export registerfunc, sqlreturn, @scalarfunc, @sr_str
 
 
 function changes(db::SQLiteDB)
diff --git a/src/UDF.jl b/src/UDF.jl
@@ -18,6 +18,8 @@ function registerfunc(db, name, nargs, func, step, final, isdeterm)
         end
     end
 
+    @assert (-1 <= nargs <= 127) "nargs must follow the inequality -1 <= nargs <= 127"
+
     cfunc = func == C_NULL ? C_NULL : cfunction(
         func, Nothing, (Ptr{Void}, Cint, Ptr{Ptr{Void}})
     )

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ function registerfunc(db, name, nargs, func, step, final, isdeterm)`
`18`	`18`	`end`
`19`	`19`	`end`
`20`	`20`
	`21`	`+ @assert (-1 <= nargs <= 127) "nargs must follow the inequality -1 <= nargs <= 127"`
	`22`	`+`
`21`	`23`	`cfunc = func == C_NULL ? C_NULL : cfunction(`
`22`	`24`	`func, Nothing, (Ptr{Void}, Cint, Ptr{Ptr{Void}})`
`23`	`25`	`)`