Updates for new General registry world and remove deprecations (#168)

Author: quinnj

Project.toml

@@ -0,0 +1,18 @@
+name = "SQLite"
+uuid = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
+
+[deps]
+BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
+DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+WeakRefStrings = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
+
+[compat]
+DataFrames = "≥ 0.11.0"
+WeakRefStrings = "≥ 0.4.0"
+julia = "≥ 1.0.0"

REQUIRE

@@ -1,11 +1,7 @@
 module SQLite
 
-using Random, Missings, DataStreams, WeakRefStrings, LegacyStrings, DataFrames
-import LegacyStrings: UTF16String
-
-import Serialization
-
-export Data, DataFrame
+using Random, Serialization
+using WeakRefStrings, DataFrames
 
 struct SQLiteException <: Exception
     msg::AbstractString
@@ -14,11 +10,8 @@ end
 include("consts.jl")
 include("api.jl")
 
-#TODO: Support sqlite3_open_v2
 # Normal constructor from filename
 sqliteopen(file, handle) = sqlite3_open(file, handle)
-sqliteopen(file::UTF16String, handle) = sqlite3_open16(file, handle)
-#sqliteerror() = throw(SQLiteException(unsafe_string(sqlite3_errmsg())))
 sqliteerror(db) = throw(SQLiteException(unsafe_string(sqlite3_errmsg(db.handle))))
 
 """
@@ -150,13 +143,6 @@ bind!(stmt::Stmt, i::Int, val::Missing)        = (sqlite3_bind_null(stmt.handle,
 bind!(stmt::Stmt, i::Int, val::AbstractString) = (sqlite3_bind_text(stmt.handle, i ,val); return nothing)
 bind!(stmt::Stmt, i::Int, val::WeakRefString{UInt8})   = (sqlite3_bind_text(stmt.handle, i, val.ptr, val.len); return nothing)
 bind!(stmt::Stmt, i::Int, val::WeakRefString{UInt16})  = (sqlite3_bind_text16(stmt.handle, i, val.ptr, val.len*2); return nothing)
-bind!(stmt::Stmt, i::Int, val::UTF16String)    = (sqlite3_bind_text16(stmt.handle, i, val); return nothing)
-function bind!(stmt::Stmt, i::Int, val::WeakRefString{UInt32})
-    A = UTF32String(pointer_to_array(val.ptr, val.len+1, false))
-    return bind!(stmt, i, convert(String, A))
-end
-# We may want to track the new ByteVec mutable struct proposed at https://github.com/JuliaLang/julia/pull/8964
-# as the "official" bytes mutable struct instead of Vector{UInt8}
 bind!(stmt::Stmt, i::Int, val::Vector{UInt8})  = (sqlite3_bind_blob(stmt.handle, i, val); return nothing)
 # Fallback is BLOB and defaults to serializing the julia value
 
@@ -413,24 +399,6 @@ function removeduplicates!(db, table::AbstractString, cols::AbstractArray{T}) wh
     return
  end
 
-"`SQLite.Source` implements the `Source` interface in the `DataStreams` framework"
-mutable struct Source <: Data.Source
-    schema::Data.Schema
-    stmt::Stmt
-    status::Cint
-end
-
-"SQLite.Sink implements the `Sink` interface in the `DataStreams` framework"
-mutable struct Sink <: Data.Sink
-    db::DB
-    tablename::String
-    stmt::Stmt
-    transaction::String
-    cols::Int
-end
-
-include("Source.jl")
-include("Sink.jl")
 include("tables.jl")
 
 """
@@ -452,6 +420,6 @@ indices(db::DB, sink=DataFrame) = Query(db, "SELECT name FROM sqlite_master WHER
 
 returns a list of columns in `table`
 """
-columns(db::DB,table::AbstractString, sink=DataFrame) = Query(db, "PRAGMA table_info($(esc_id(table)))") |> sink
+columns(db::DB, table::AbstractString, sink=DataFrame) = Query(db, "PRAGMA table_info($(esc_id(table)))") |> sink
 
-end # module
+end # module

src/SQLite.jl

@@ -11,7 +11,6 @@ function sqlvalue(values, i)
     elseif valuetype == SQLITE_FLOAT
         return sqlite3_value_double(temp_val_ptr)
     elseif valuetype == SQLITE_TEXT
-        # TODO: have a way to return UTF16
         return unsafe_string(sqlite3_value_text(temp_val_ptr))
     elseif valuetype == SQLITE_BLOB
         nbytes = sqlite3_value_bytes(temp_val_ptr)
@@ -20,15 +19,14 @@ function sqlvalue(values, i)
         unsafe_copyto!(pointer(buf), convert(Ptr{UInt8}, blob), nbytes)
         return sqldeserialize(buf)
     else
-        return null
+        return missing
     end
 end
 
 sqlreturn(context, ::Missing)           = sqlite3_result_null(context)
 sqlreturn(context, val::Int32)          = sqlite3_result_int(context, val)
 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::Vector{UInt8})  = sqlite3_result_blob(context, val)
 
@@ -37,7 +35,7 @@ sqlreturn(context, val) = sqlreturn(context, sqlserialize(val))
 
 # Internal method for generating an SQLite scalar function from
 # a Julia function name
-function scalarfunc(func,fsym=symbol(string(func)))
+function scalarfunc(func,fsym=Symbol(string(func)))
     # check if name defined in Base so we don't clobber Base methods
     nm = isdefined(Base,fsym) ? :(Base.$fsym) : fsym
     return quote
@@ -69,7 +67,7 @@ function bytestoint(ptr::Ptr{UInt8}, start::Int, len::Int)
     return htol(s)
 end
 
-function stepfunc(init, func, fsym=symbol(string(func)*"_step"))
+function stepfunc(init, func, fsym=Symbol(string(func)*"_step"))
     nm = isdefined(Base,fsym) ? :(Base.$fsym) : fsym
     return quote
         function $(nm)(context::Ptr{Cvoid}, nargs::Cint, values::Ptr{Ptr{Cvoid}})
@@ -143,7 +141,7 @@ function stepfunc(init, func, fsym=symbol(string(func)*"_step"))
     end
 end
 
-function finalfunc(init, func, fsym=symbol(string(func)*"_final"))
+function finalfunc(init, func, fsym=Symbol(string(func)*"_final"))
     nm = isdefined(Base,fsym) ? :(Base.$fsym) : fsym
     return quote
         function $(nm)(context::Ptr{Cvoid}, nargs::Cint, values::Ptr{Ptr{Cvoid}})
@@ -234,4 +232,4 @@ end
 # annotate types because the MethodError makes more sense that way
 regexp(r::AbstractString, s::AbstractString) = occursin(Regex(r), s)
 # macro for preserving the special characters in a string
-macro sr_str(s) s end
+macro sr_str(s) s end