Initial 0.6 compat

Author: quinnj

src/MySQL.jl

@@ -1,8 +1,10 @@
-__precompile__()
-
+__precompile__(true)
 module MySQL
     using Compat
     using DataFrames
+    using Missings
+    using DataStreams
+    using Compat.Dates
 
     include("config.jl")
     include("consts.jl")

src/config.jl

@@ -5,15 +5,21 @@
 #
 # TODO: Need to update lib_choices for Mac OS X and Windows.
 
+@static if !isdefined(Base, Symbol("@isdefined"))
+macro isdefined(x)
+    esc(:(isdefined($x)))
+end
+end
+
 let
     global mysql_lib
     succeeded = false
-    if !isdefined(:mysql_lib)
-        @static is_linux() ? (lib_choices = ["libmysql.so", "libmysqlclient.so",
+    if !@isdefined(:mysql_lib)
+        @static Compat.Sys.islinux() ? (lib_choices = ["libmysql.so", "libmysqlclient.so",
                                              "libmysqlclient_r.so", "libmariadb.so",
                                              "libmysqlclient_r.so.16"]) : nothing
-        @static is_apple() ? (lib_choices = ["libmysqlclient.dylib", "libperconaserverclient.dylib"]) : nothing
-        @static is_windows() ? (lib_choices = ["libmysql.dll", "libmariadb.dll"]) : nothing
+        @static Compat.Sys.isapple() ? (lib_choices = ["libmysqlclient.dylib", "libperconaserverclient.dylib"]) : nothing
+        @static Compat.Sys.iswindows() ? (lib_choices = ["libmysql.dll", "libmariadb.dll"]) : nothing
         local lib
         for lib in lib_choices
             try
@@ -22,7 +28,7 @@ let
                 break
             end
         end
-        succeeded || error("MYSQL library not found")
+        succeeded || error("MySQL library not found")
         @eval const mysql_lib = $lib
     end
 end

src/consts.jl

@@ -152,7 +152,7 @@ const MYSQL_NO_DATA = 100
 
 const MYSQL_DEFAULT_PORT = 3306
 
-if is_windows()
+if Compat.Sys.iswindows()
 	MYSQL_DEFAULT_SOCKET = "MySQL"
 else
 	MYSQL_DEFAULT_SOCKET = "/tmp/mysql.sock"

src/datetime.jl

@@ -5,17 +5,6 @@ import Base.==
 const MYSQL_DATE_FORMAT = Dates.DateFormat("yyyy-mm-dd")
 const MYSQL_DATETIME_FORMAT = Dates.DateFormat("yyyy-mm-dd HH:MM:SS")
 
-function Base.convert(::Type{Date}, datestr::String)
-    Date(datestr, MYSQL_DATE_FORMAT)
-end
-
-function Base.convert(::Type{DateTime}, dtimestr::String)
-    if !contains(dtimestr, " ")
-        dtimestr = "1970-01-01 " * dtimestr
-    end
-    DateTime(dtimestr, MYSQL_DATETIME_FORMAT)
-end
-
 function Base.convert(::Type{DateTime}, mtime::MYSQL_TIME)
     if mtime.year == 0 || mtime.month == 0 || mtime.day == 0
         DateTime(1970, 1, 1,

src/results.jl

@@ -67,33 +67,30 @@ end
 """
 Get the C type that would be needed when using prepared statement.
 """
-function mysql_get_ctype(jtype::DataType)
-    if (jtype == Date || jtype == DateTime)
-        return MYSQL_TIME
-    end
-
-    return jtype
-end
+function mysql_get_ctype end
+mysql_get_ctype(::Type{<:Dates.TimeType}) = MYSQL_TIME
+mysql_get_ctype(x) = x
 
 mysql_get_ctype(mysqltype::MYSQL_TYPE) = 
     mysql_get_ctype(mysql_get_julia_type(mysqltype))
 
 """
 Interpret a string as a julia datatype.
 """
+function mysql_interpret_field end
 mysql_interpret_field(strval::String, ::Type{Cuchar}) = UInt8(strval[1])
 
-mysql_interpret_field{T<:Number}(strval::String, ::Type{T}) =
+mysql_interpret_field(strval::String, ::Type{T}) where {T<:Number} =
     parse(T, strval)
 
-mysql_interpret_field{T<:String}(strval::String, ::Type{T}) =
+mysql_interpret_field(strval::String, ::Type{<:AbstractString}) =
     strval
 
 mysql_interpret_field(strval::String, ::Type{Date}) =
-    convert(Date, strval)
+    Dates.Date(datestr, MYSQL_DATE_FORMAT)
 
-mysql_interpret_field(strval::String, ::Type{DateTime}) =
-    convert(DateTime, strval)
+functionmysql_interpret_field(strval::String, ::Type{DateTime}) =
+    Dates.DateTime(contains(strval, " ") ? strval : "1970-01-01 " * strval, MYSQL_DATETIME_FORMAT)
 
 """
 Load a bytestring from `result` pointer given the field index `idx`.
@@ -125,16 +122,7 @@ Returns an array of MYSQL_TYPE's corresponding to each field in the table.
 """
 function mysql_get_field_types(result::MYSQL_RES)
     mysqlfields = mysql_metadata(result)
-    return mysql_get_field_types(mysqlfields)
-end
-
-function mysql_get_field_types(mysqlfields::Array{MYSQL_FIELD})
-    nfields = length(mysqlfields)
-    mysqlfield_types = Array{MYSQL_TYPE}(nfields)
-    for i = 1:nfields
-        mysqlfield_types[i] = mysqlfields[i].field_type
-    end
-    return mysqlfield_types
+    return map(x->x.field_type, mysqlfields)
 end
 
 """

src/types.jl

@@ -9,7 +9,7 @@ const MYSQL_TYPE = UInt32
 The field object that contains the metadata of the table. 
 Returned by mysql_fetch_fields API.
 """
-immutable MYSQL_FIELD
+struct MYSQL_FIELD
     name :: Ptr{Cchar}             ##  Name of column
     org_name :: Ptr{Cchar}         ##  Original column name, if an alias
     table :: Ptr{Cchar}            ##  Table of column if column was a field
@@ -36,7 +36,7 @@ end
 """
 Type mirroring MYSQL_TIME C struct.
 """
-immutable MYSQL_TIME
+struct MYSQL_TIME
     year::Cuint
     month::Cuint
     day::Cuint
@@ -51,7 +51,7 @@ end
 """
 Mirror to MYSQL_BIND struct in mysql_bind.h
 """
-immutable MYSQL_BIND
+struct MYSQL_BIND
     length::Ptr{Culong}
     is_null::Ptr{Cchar}
     buffer::Ptr{Void}
@@ -89,7 +89,7 @@ end
 """
 Mirror to MYSQL_ROWS struct in mysql.h
 """
-immutable MYSQL_ROWS
+struct MYSQL_ROWS
     next::Ptr{MYSQL_ROWS}
     data::MYSQL_ROW
     length::Culong
@@ -98,7 +98,7 @@ end
 """
 Mirror to MYSQL_STMT struct in mysql.h
 """
-immutable MYSQL_STMT # This is different in mariadb header file.
+struct MYSQL_STMT # This is different in mariadb header file.
     mem_root::MEM_ROOT
     list::LIST
     mysql::Ptr{Void}
@@ -132,7 +132,7 @@ end
 """
 The MySQL handle.
 """
-type MySQLHandle
+mutable struct MySQLHandle
     mysqlptr::Ptr{Void}
     host::String
     user::String
@@ -153,41 +153,41 @@ DB:   $(hndl.db)
     end
 end
 
-type MySQLResult
+mutable struct MySQLResult
     con::MySQLHandle
     resptr::MYSQL_RES
     function MySQLResult(hndl, resptr)
         res = new(hndl, C_NULL)
         res.resptr = resptr
-        finalizer(res, x -> mysql_free_result(x.resptr))
+        finalizer(x -> mysql_free_result(x.resptr), res)
         return res
     end
 end
 
 """
 Iterator for the mysql result.
 """
-type MySQLRowIterator
+mutable struct MySQLRowIterator{T}
     result::MySQLResult
-    jtypes::Vector{Type}
-    is_nullables::Vector{Bool}
+    # jtypes::Vector{Type}
+    # is_nullables::Vector{Bool}
     rowsleft::Int64
 end
 
 """
 Iterator for prepared statement results.
 """
-type MySQLStatementIterator
+mutable struct MySQLStatementIterator
     hndl::MySQLHandle
     jtypes::Vector{Type}
     is_nullables::Vector{Bool}
     binding::Vector{MYSQL_BIND}
 end
 
-@compat abstract type MySQLError end
+abstract type MySQLError end
 
 # For errors that happen in the MySQL C connector
-type MySQLInternalError <: MySQLError
+mutable struct MySQLInternalError <: MySQLError
     con::Ptr{Void}
 
     function MySQLInternalError(con::MySQLHandle)
@@ -202,7 +202,7 @@ end
 Base.showerror(io::IO, e::MySQLInternalError) = print(io, unsafe_string(mysql_error(e.con)))
 
 # Internal errors that happen when using prepared statements
-type MySQLStatementError <: MySQLError
+mutable struct MySQLStatementError <: MySQLError
     stmt::Ptr{MYSQL_STMT}
 
     function MySQLStatementError(hndl::MySQLHandle)
@@ -218,13 +218,13 @@ Base.showerror(io::IO, e::MySQLStatementError) =
     print(io, unsafe_string(mysql_stmt_error(e.stmt)))
 
 # For errors that happen in MySQL.jl
-type MySQLInterfaceError <: MySQLError
+mutable struct MySQLInterfaceError <: MySQLError
     msg::String
 end
 
 Base.showerror(io::IO, e::MySQLInterfaceError) = print(io, e.msg)
 
-type MySQLMetadata
+mutable struct MySQLMetadata
     names::Vector{String}
     mtypes::Vector{MYSQL_TYPE}
     jtypes::Vector{Type}