Allow bytearrays to be stored as BLOBs.

Any object that is serialized is now put in a Serialization type then
serialized.

When sqldeserialize is called on a bytearray, it checks whether the
deserialized array is a Serialization and if so returns the object it holds,
otherwise returning the array.

Author: Sean1708

src/SQLite.jl

@@ -16,6 +16,11 @@ immutable NullType end
 const NULL = NullType()
 Base.show(io::IO,::NullType) = print(io,"NULL")
 
+# internal wrapper type to, in-effect, mark something which has been serialized
+type Serialization
+    object
+end
+
 type ResultSet
     colnames
     values::Vector{Any}
@@ -132,13 +137,18 @@ Base.bind(stmt::SQLiteStmt,i::Int,val::Int64)          = @CHECK stmt.db sqlite3_
 Base.bind(stmt::SQLiteStmt,i::Int,val::NullType)       = @CHECK stmt.db sqlite3_bind_null(stmt.handle,i)
 Base.bind(stmt::SQLiteStmt,i::Int,val::AbstractString) = @CHECK stmt.db sqlite3_bind_text(stmt.handle,i,val)
 Base.bind(stmt::SQLiteStmt,i::Int,val::UTF16String)    = @CHECK stmt.db sqlite3_bind_text16(stmt.handle,i,val)
+Base.bind(stmt::SQLiteStmt,i::Int,val::Vector{UInt8})  = @CHECK stmt.db sqlite3_bind_blob(stmt.handle,i,val)
 # Fallback is BLOB and defaults to serializing the julia value
 function sqlserialize(x)
     t = IOBuffer()
-    serialize(t,x)
+    # deserialize will sometimes return a random object when called on an array
+    # which has not been previously serialized, we can use this type to check
+    # that the array has been serialized
+    s = Serialization(x)
+    serialize(t,s)
     return takebuf_array(t)
 end
-Base.bind(stmt::SQLiteStmt,i::Int,val) = @CHECK stmt.db sqlite3_bind_blob(stmt.handle,i,sqlserialize(val))
+Base.bind(stmt::SQLiteStmt,i::Int,val) = bind(stmt,i,sqlserialize(val))
 #TODO:
  #int sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
  #int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
@@ -159,7 +169,23 @@ function execute(db::SQLiteDB,sql::AbstractString)
     return changes(db)
 end
 
-sqldeserialize(r) = deserialize(IOBuffer(r))
+function sqldeserialize(r)
+    # try blocks introduce new scope
+    local v
+    # deserialize will sometimes, but not consistently (see comment in
+    # sqlserialize), throw an error when called on an object which hasn't been
+    # previously serialized
+    try
+        v = deserialize(IOBuffer(r))
+    catch
+        return r
+    end
+    if isa(v, Serialization)
+        return v.object
+    else
+        return r
+    end
+end
 
 function query(db::SQLiteDB,sql::AbstractString, values=[])
     stmt = SQLiteStmt(db,sql)

src/UDF.jl

@@ -30,9 +30,10 @@ sqlreturn(context, val::Int64)          = sqlite3_result_int64(context, val)
 sqlreturn(context, val::Float64)        = sqlite3_result_double(context, val)
 sqlreturn(context, val::UTF16String)    = sqlite3_result_text16(context, val)
 sqlreturn(context, val::AbstractString) = sqlite3_result_text(context, val)
-sqlreturn(context, val)                 = sqlite3_result_blob(context, sqlserialize(val))
+sqlreturn(context, val::Vector{UInt8})  = sqlite3_result_blob(context, sqlserialize(val))
 
 sqlreturn(context, val::Bool) = sqlreturn(context, int(val))
+sqlreturn(context, val) = sqlreturn(context, sqlserialize(val))
 
 # Internal method for generating an SQLite scalar function from
 # a Julia function name