Updates for 1.0

Author: quinnj

.appveyor.yml

@@ -1,12 +1,17 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+  - julia_version: 1
+  - julia_version: nightly
 
-services:
-  - mysql
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+# # Uncomment the following lines to allow failures on nightly julia
+# # (tests will run but not make your overall status red)
+# matrix:
+#   allow_failures:
+#   - julia_version: nightly
 
 branches:
   only:
@@ -20,24 +25,18 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# if there's a newer build queued for the same PR, cancel this one
-  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
-        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
-        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
-        throw "There are newer queued builds for this pull request, failing early." }
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"MySQL\"); Pkg.build(\"MySQL\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"MySQL\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+
+# # Uncomment to support code coverage upload. Should only be enabled for packages
+# # which would have coverage gaps without running on Windows
+# on_success:
+#   - echo "%JL_CODECOV_SCRIPT%"
+#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

.gitignore

@@ -35,4 +35,5 @@ deps/deps.jl
 deps/usr/
 deps/mysql-connector*
 deps/downloads/
-deps/manifests/
+deps/manifests/
+deps/build.log

.travis.yml

@@ -9,7 +9,7 @@ os:
   - osx
 
 julia:
-  - 0.6
+  - 1.0
   - nightly
 
 notifications:
@@ -19,7 +19,7 @@ after_success:
   # push coverage results to Coveralls
   #- julia -e 'cd(Pkg.dir("MySQL")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
   # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("MySQL")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'using Pkg; cd(Pkg.dir("MySQL")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
 
 before_script:
 - export OLD_PATH=$LD_LIBRARY_PATH

REQUIRE

@@ -1,6 +1,5 @@
-julia 0.6
+julia 0.7
 DataStreams
-Compat 0.48.0
 Missings
 DecFP
 BinaryProvider

src/MySQL.jl

@@ -1,17 +1,8 @@
-__precompile__(true)
 module MySQL
-using Compat, Compat.Dates
-using DataStreams, Missings
 
-export Data
+using DataStreams, Missings, Dates
 
-@static if isdefined(Core, :NamedTuple)
-    macro NT(args...)
-        return esc(:(($(args...),)))
-    end
-else
-    using NamedTuples
-end
+export Data
 
 abstract type MySQLError end
 # For errors that happen in MySQL.jl
@@ -131,9 +122,4 @@ query(source::Query, sink::T; append::Bool=false, transforms::Dict=Dict{Int,Func
 
 include("prepared.jl")
 
-Base.@deprecate mysql_options MySQL.setoptions!
-Base.@deprecate mysql_connect MySQL.connect
-Base.@deprecate mysql_disconnect MySQL.disconnect
-Base.@deprecate mysql_insert_id MySQL.insertid
-
 end # module

src/api.jl

@@ -1,6 +1,6 @@
 module API
 
-using Compat, Compat.Dates, DecFP, Missings
+using Dates, DecFP, Missings
 
 # Load libmariadb from our deps.jl
 const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")

src/consts.jl

@@ -27,10 +27,6 @@ const MYSQL_TYPE_VAR_STRING  = UInt32(253)
 const MYSQL_TYPE_STRING      = UInt32(254)
 const MYSQL_TYPE_GEOMETRY    = UInt32(255)
 
-if length(methods(Base.bitstring)) == 1
-    bitstring(x) = bits(x)
-end
-
 struct Bit
     bits::UInt64
 end
@@ -161,7 +157,7 @@ const MYSQL_DEFAULT_PORT = 3306
 const CR_SERVER_GONE_ERROR = 2006
 const CR_SERVER_LOST = 2013
 
-if Compat.Sys.iswindows()
+if Sys.iswindows()
 	const MYSQL_DEFAULT_SOCKET = "MySQL"
 else
 	const MYSQL_DEFAULT_SOCKET = "/tmp/mysql.sock"

src/prepared.jl

@@ -27,7 +27,7 @@ mutable struct Stmt
         API.mysql_stmt_prepare(ptr, sql) != 0 && throw(MySQLInternalError(conn))
         nparams = API.mysql_stmt_param_count(ptr)
         stmt = new(ptr, sql, nparams, 0)
-        @compat finalizer(x->API.mysql_stmt_close(x.ptr), stmt)
+        finalizer(x->API.mysql_stmt_close(x.ptr), stmt)
         return stmt
     end
 end

src/types.jl

@@ -36,7 +36,7 @@ mutable struct Result
     function Result(ptr)
         res = new(ptr)
         if ptr != C_NULL
-            @compat finalizer(API.mysql_free_result, res)
+            finalizer(API.mysql_free_result, res)
         end
         return res
     end

test/runtests.jl

@@ -1,13 +1,5 @@
 using MySQL, Missings
-using Compat, Compat.Test, Compat.Dates
-
-@static if isdefined(Core, :NamedTuple)
-    macro NT(args...)
-        return esc(:(($(args...),)))
-    end
-else
-    using NamedTuples
-end
+using Test, Dates
 
 if haskey(ENV, "APPVEYOR_BUILD_NUMBER")
     pwd = "Password12!"
@@ -52,7 +44,7 @@ res = MySQL.query(conn, "select * from Employee")
 @test length(res[1]) == 4
 @test res.ID == [1,2,3,4]
 
-expected = @NT(
+expected = (
   ID        = Int32[1, 2, 3, 4],
   Name      = Union{Missing, String}["John", "Tom", "Jim", "Tim"],
   Salary    = Union{Missing, Float32}[10000.5, 20000.25, 30000.0, 15000.5],
@@ -73,9 +65,7 @@ MySQL.execute!(conn, "INSERT INTO Employee () VALUES ();")
 res = MySQL.query(conn, "select * from Employee")
 
 foreach(x->push!(x[2], x[1] == 1 ? Int32(5) : missing), enumerate(expected))
-if isdefined(Core, :NamedTuple)
 @test isequal(res, expected)
-end
 
 q = MySQL.Query(conn, "select * from Employee")
 for row in Data.rows(q)
@@ -97,10 +87,10 @@ res = MySQL.query(conn, "select Salary from Employee")
 
 stmt = MySQL.Stmt(conn, "INSERT INTO Employee (Name, Salary, JoinDate, LastLogin, LunchTime, OfficeNo, empno) VALUES (?, ?, ?, ?, ?, ?, ?);")
 
-values = [@NT(Name="John", Salary=10000.50, JoinDate=Date("2015-8-3"), LastLogin=DateTime("2015-9-5T12:31:30"), LunchTime=Dates.Time(12,00,00), OfficeNo=1, empno=1301),
-          @NT(Name="Tom",  Salary=20000.25, JoinDate=Date("2015-8-4"), LastLogin=DateTime("2015-10-12T13:12:14"), LunchTime=Dates.Time(13,00,00), OfficeNo=12, empno=1422),
-          @NT(Name="Jim",  Salary=30000.00, JoinDate=Date("2015-6-2"), LastLogin=DateTime("2015-9-5T10:05:10"), LunchTime=Dates.Time(12,30,00), OfficeNo=45, empno=1567),
-          @NT(Name="Tim",  Salary=15000.50, JoinDate=Date("2015-7-25"), LastLogin=DateTime("2015-10-10T12:12:25"), LunchTime=Dates.Time(12,30,00), OfficeNo=56, empno=3200)]
+values = [(Name="John", Salary=10000.50, JoinDate=Date("2015-8-3"), LastLogin=DateTime("2015-9-5T12:31:30"), LunchTime=Dates.Time(12,00,00), OfficeNo=1, empno=1301),
+          (Name="Tom",  Salary=20000.25, JoinDate=Date("2015-8-4"), LastLogin=DateTime("2015-10-12T13:12:14"), LunchTime=Dates.Time(13,00,00), OfficeNo=12, empno=1422),
+          (Name="Jim",  Salary=30000.00, JoinDate=Date("2015-6-2"), LastLogin=DateTime("2015-9-5T10:05:10"), LunchTime=Dates.Time(12,30,00), OfficeNo=45, empno=1567),
+          (Name="Tim",  Salary=15000.50, JoinDate=Date("2015-7-25"), LastLogin=DateTime("2015-10-10T12:12:25"), LunchTime=Dates.Time(12,30,00), OfficeNo=56, empno=3200)]
 
 Data.stream!(values, stmt)