Fix depwarns and tests for 0.5 (#51)

Author: nkottary

.travis.yml

@@ -1,7 +1,7 @@
 language: julia
 julia:
-  - 0.3
   - release
+  - nightly
 before_script:
   - export OLD_PATH=$LD_LIBRARY_PATH
   - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`mariadb_config --libs | cut -d ' ' -f1 | sed 's/-L//'`

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.3
+julia 0.4
 DataFrames
 Compat 0.7.20
 Dates

src/api.jl

@@ -150,8 +150,14 @@ function mysql_stmt_init(mysqlptr::Ptr{Void})
                  mysqlptr)
 end
 
+if VERSION < v"0.5-"
+    _utf8 = utf8
+else
+    _utf8 = String
+end
+
 function mysql_stmt_prepare(stmtptr::Ptr{MYSQL_STMT}, sql::AbstractString)
-    s = utf8(sql)
+    s = _utf8(sql)
     return ccall((:mysql_stmt_prepare, mysql_lib),
                  Cint,
                  (Ptr{Void}, Ptr{Cchar}, Culong),

src/results.jl

@@ -112,15 +112,21 @@ Load a bytestring from `result` pointer given the field index `idx`.
 function mysql_load_string_from_resultptr(result, idx)
     deref = unsafe_load(result, idx)
     deref == C_NULL && return nothing
-    strval = bytestring(deref)
+    strval = _bytestring(deref)
     length(strval) == 0 && return nothing
     return strval
 end
 
+if VERSION < v"0.5-"
+    _pointer_to_array = pointer_to_array
+else
+    _pointer_to_array(p, d; own=false) = unsafe_wrap(Array, p, d, own)
+end
+
 function mysql_metadata(result::MYSQL_RES)
     nfields = mysql_num_fields(result)
     rawfields = mysql_fetch_fields(result)
-    return pointer_to_array(rawfields, nfields)
+    return _pointer_to_array(rawfields, nfields)
 end
 
 function mysql_metadata(stmtptr::Ptr{MYSQL_STMT})
@@ -263,7 +269,7 @@ mysql_binary_interpret_field(buf, mysqltype) =
     mysql_binary_interpret_field(buf, mysql_get_ctype(mysqltype))
 
 mysql_binary_interpret_field(buf, ::Type{AbstractString}) =
-    bytestring(convert(Ptr{Cchar}, buf))
+    _bytestring(convert(Ptr{Cchar}, buf))
 
 function mysql_binary_interpret_field(buf, T::Type)
     value = unsafe_load(convert(Ptr{T}, buf), 1)
@@ -342,7 +348,7 @@ Initialize a dataframe for prepared statement results.
 mysql_init_dataframe(meta::Array{MYSQL_FIELD}, nrows) =
     mysql_init_dataframe(MySQLMetadata(meta), nrows)
 mysql_init_dataframe(meta, nrows) =
-    DataFrame(meta.jtypes, map(symbol, meta.names), @compat Int64(nrows))
+    DataFrame(meta.jtypes, map(Symbol, meta.names), @compat Int64(nrows))
 
 function mysql_result_to_dataframe(hndl::MySQLHandle)
     meta = mysql_metadata(hndl.stmtptr)

src/types.jl

@@ -193,7 +193,13 @@ type MySQLInternalError <: MySQLError
     end
 end
 
-Base.showerror(io::IO, e::MySQLInternalError) = print(io, bytestring(mysql_error(e.con)))
+if VERSION < v"0.5-"
+    _bytestring = bytestring
+else
+    _bytestring = unsafe_string
+end
+
+Base.showerror(io::IO, e::MySQLInternalError) = print(io, _bytestring(mysql_error(e.con)))
 
 # Internal errors that happen when using prepared statements
 type MySQLStatementError <: MySQLError
@@ -209,7 +215,7 @@ type MySQLStatementError <: MySQLError
 end
 
 Base.showerror(io::IO, e::MySQLStatementError) =
-    print(io, bytestring(mysql_stmt_error(e.stmt)))
+    print(io, _bytestring(mysql_stmt_error(e.stmt)))
 
 # For errors that happen in MySQL.jl
 type MySQLInterfaceError <: MySQLError
@@ -234,7 +240,7 @@ type MySQLMetadata
         lens = Array(Int, nfields)
         is_nullables = Array(Bool, nfields)
         for i in 1:nfields
-            names[i] = bytestring(fields[i].name)
+            names[i] = _bytestring(fields[i].name)
             mtypes[i] = fields[i].field_type
             jtypes[i] = mysql_get_julia_type(fields[i].field_type)
             lens[i] = fields[i].field_length

test/test_basic.jl

@@ -10,27 +10,27 @@ end
 include("test_common.jl")
 
 @compat const ArrayResults = Array{Any}[
-    [1, Nullable("John"), Nullable(10000.5f0), Nullable(convert(Date, "2015-08-03")),
+    Any[1, Nullable("John"), Nullable(10000.5f0), Nullable(convert(Date, "2015-08-03")),
      Nullable(convert(DateTime, "2015-09-05 12:31:30")),
      Nullable(convert(DateTime, "1970-01-01 12:00:00")),
      Nullable(Int8(1)), Nullable("HR"), Nullable(0x01), Nullable(Int16(1301))],
 
-    [2, Nullable("Tom"), Nullable(20000.25f0), Nullable(convert(Date, "2015-08-04")),
+    Any[2, Nullable("Tom"), Nullable(20000.25f0), Nullable(convert(Date, "2015-08-04")),
      Nullable(convert(DateTime, "2015-10-12 13:12:14")),
      Nullable(convert(DateTime, "1970-01-01 13:00:00")),
      Nullable(Int8(12)), Nullable("HR"), Nullable(0x01), Nullable(Int16(1422))],
 
-    [3, Nullable("Jim"), Nullable(25000.0f0), Nullable(convert(Date, "2015-06-02")),
+    Any[3, Nullable("Jim"), Nullable(25000.0f0), Nullable(convert(Date, "2015-06-02")),
      Nullable(convert(DateTime, "2015-09-05 10:05:10")),
      Nullable(convert(DateTime, "1970-01-01 12:30:00")),
      Nullable(Int8(45)), Nullable("Management"), Nullable{UInt8}(), Nullable(Int16(1567))],
 
-    [4, Nullable("Tim"), Nullable(25000.0f0), Nullable(convert(Date, "2015-07-25")),
+    Any[4, Nullable("Tim"), Nullable(25000.0f0), Nullable(convert(Date, "2015-07-25")),
      Nullable(convert(DateTime, "2015-10-10 12:12:25")),
      Nullable(convert(DateTime, "1970-01-01 12:30:00")),
      Nullable(Int8(56)), Nullable("Accounts"), Nullable(0x01), Nullable(Int16(3200))],
 
-    [5, Nullable{AbstractString}(), Nullable{Float32}(), Nullable{Date}(),
+    Any[5, Nullable{AbstractString}(), Nullable{Float32}(), Nullable{Date}(),
      Nullable{DateTime}(), Nullable{DateTime}(),
      Nullable{Int8}(), Nullable{AbstractString}(), Nullable{UInt8}(), Nullable{Int16}()]]
 

test/test_prep.jl

@@ -18,27 +18,27 @@ const DataFrameResultsPrep = DataFrame(
     empno=@data([1301, 1422, 1567, 3200, NA]))
 
 @compat const ArrayResultsPrep = Array{Any}[
-    [1, Nullable("John"), Nullable(10000.5f0), Nullable(convert(Date, "2015-08-03")),
+    Any[1, Nullable("John"), Nullable(10000.5f0), Nullable(convert(Date, "2015-08-03")),
      Nullable(convert(DateTime, "2015-09-05 12:31:30")),
      Nullable(convert(DateTime, "1970-01-01 12:00:00")),
      Nullable(Int8(1)), Nullable{AbstractString}(), Nullable{UInt8}(), Nullable(Int16(1301))],
 
-    [2, Nullable("Tom"), Nullable(20000.25f0), Nullable(convert(Date, "2015-08-04")),
+    Any[2, Nullable("Tom"), Nullable(20000.25f0), Nullable(convert(Date, "2015-08-04")),
      Nullable(convert(DateTime, "2015-10-12 13:12:14")),
      Nullable(convert(DateTime, "1970-01-01 13:00:00")),
      Nullable(Int8(12)), Nullable{AbstractString}(), Nullable{UInt8}(), Nullable(Int16(1422))],
 
-    [3, Nullable("Jim"), Nullable(25000.0f0), Nullable(convert(Date, "2015-06-02")),
+    Any[3, Nullable("Jim"), Nullable(25000.0f0), Nullable(convert(Date, "2015-06-02")),
      Nullable(convert(DateTime, "2015-09-05 10:05:10")),
      Nullable(convert(DateTime, "1970-01-01 12:30:00")),
      Nullable(Int8(45)), Nullable{AbstractString}(), Nullable{UInt8}(), Nullable(Int16(1567))],
 
-    [4, Nullable("Tim"), Nullable(25000.0f0), Nullable(convert(Date, "2015-07-25")),
+    Any[4, Nullable("Tim"), Nullable(25000.0f0), Nullable(convert(Date, "2015-07-25")),
      Nullable(convert(DateTime, "2015-10-10 12:12:25")),
      Nullable(convert(DateTime, "1970-01-01 12:30:00")),
      Nullable(Int8(56)), Nullable{AbstractString}(), Nullable{UInt8}(), Nullable(Int16(3200))],
 
-    [5, Nullable{AbstractString}(), Nullable{Float32}(), Nullable{Date}(),
+    Any[5, Nullable{AbstractString}(), Nullable{Float32}(), Nullable{Date}(),
      Nullable{DateTime}(), Nullable{DateTime}(),
      Nullable{Int8}(), Nullable{AbstractString}(), Nullable{UInt8}(), Nullable{Int16}()]]