0.5 Compat

Author: quinnj

src/SQLite.jl

@@ -26,11 +26,11 @@ sqliteerror(db) = throw(SQLiteException(bytestring(sqlite3_errmsg(db.handle))))
 
 "represents an SQLite database, either backed by an on-disk file or in-memory"
 type DB
-    file::UTF8String
+    file::@compat(String)
     handle::Ptr{Void}
     changes::Int
 
-    function DB(f::UTF8String)
+    function DB(f::@compat(String))
         handle = Ref{Ptr{Void}}()
         f = isempty(f) ? f : expanduser(f)
         if @OK sqliteopen(f,handle)
@@ -45,7 +45,7 @@ type DB
     end
 end
 "`SQLite.DB(file::AbstractString)` opens or creates an SQLite database with `file`"
-DB(f::AbstractString) = DB(utf8(f))
+DB(f::AbstractString) = DB(f)
 "`SQLite.DB()` creates an in-memory SQLite database"
 DB() = DB(":memory:")
 
@@ -79,7 +79,7 @@ function _close(stmt::Stmt)
     return
 end
 
-sqliteprepare(db,sql,stmt,null) = @CHECK db sqlite3_prepare_v2(db.handle,utf8(sql),stmt,null)
+sqliteprepare(db,sql,stmt,null) = @CHECK db sqlite3_prepare_v2(db.handle,sql,stmt,null)
 
 # TO DEPRECATE
 type SQLiteDB{T<:AbstractString}
@@ -131,7 +131,7 @@ bind!(stmt::Stmt,i::Int,val::PointerString{UInt16})  = (sqlite3_bind_text16(stmt
 bind!(stmt::Stmt,i::Int,val::UTF16String)    = (sqlite3_bind_text16(stmt.handle,i,val); return nothing)
 function bind!(stmt::Stmt,i::Int,val::PointerString{UInt32})
     A = UTF32String(pointer_to_array(val.ptr, val.len+1, false))
-    return bind!(stmt, i, convert(UTF8String,A))
+    return bind!(stmt, i, convert(@compat(String),A))
 end
 # We may want to track the new ByteVec type proposed at https://github.com/JuliaLang/julia/pull/8964
 # as the "official" bytes type instead of Vector{UInt8}
@@ -310,7 +310,7 @@ end
 type Sink <: Data.Sink # <: IO
     schema::Data.Schema
     db::DB
-    tablename::UTF8String
+    tablename::@compat(String)
     stmt::Stmt
 end
 

src/Sink.jl

@@ -19,7 +19,7 @@ function Sink(schema::Data.Schema,db::DB,tablename::AbstractString="julia_"*rand
     SQLite.execute!(db,"CREATE $temp TABLE $ifnotexists $(esc_id(tablename)) ($(join(columns,',')))")
     params = chop(repeat("?,",cols))
     stmt = SQLite.Stmt(db,"INSERT INTO $(esc_id(tablename)) VALUES ($params)")
-    return Sink(schema,db,utf8(tablename),stmt)
+    return Sink(schema,db,tablename,stmt)
 end
 
 "constructs a new SQLite.Sink from the given `SQLite.Source`; uses `source` schema to create the SQLite table"

src/Source.jl

@@ -19,7 +19,7 @@ function Source(db::DB, sql::AbstractString, values=[]; rows::Int=0, stricttypes
     bind!(stmt, values)
     status = SQLite.execute!(stmt)
     cols = SQLite.sqlite3_column_count(stmt.handle)
-    header = Array(UTF8String,cols)
+    header = Array(@compat(String),cols)
     types = Array(DataType,cols)
     for i = 1:cols
         header[i] = bytestring(SQLite.sqlite3_column_name(stmt.handle,i))
@@ -41,7 +41,7 @@ function juliatype(handle,col)
         return juliatype(x)
     end
 end
-juliatype(x) = x == SQLITE_INTEGER ? Int : x == SQLITE_FLOAT ? Float64 : x == SQLITE_TEXT ? UTF8String : Any
+juliatype(x) = x == SQLITE_INTEGER ? Int : x == SQLITE_FLOAT ? Float64 : x == SQLITE_TEXT ? @compat(String) : Any
 
 sqlitevalue{T<:Union{Signed,Unsigned}}(::Type{T},handle,col) = convert(T, sqlite3_column_int64(handle,col))
 const FLOAT_TYPES = Union{Float16,Float32,Float64} # exclude BigFloat

src/api.jl

@@ -66,7 +66,7 @@ end
 function sqlite3_bind_parameter_index(stmt::Ptr{Void},value::AbstractString)
     return ccall( (:sqlite3_bind_parameter_index, sqlite3_lib),
         Cint, (Ptr{Void},Ptr{UInt8}),
-        stmt,utf8(value))
+        stmt,value)
 end
 # SQLITE_API int sqlite3_bind_double(sqlite3_stmt*, int, double);
 function sqlite3_bind_double(stmt::Ptr{Void},col::Int,value::Float64)