avoid NamedTuple{names, types}, fix #130 (#131)

* avoid NamedTuple{names, types}, fix #130

* fix 130 for julia nightly

* added test for issue 130

Author: wookay

.travis.yml

@@ -9,6 +9,7 @@ os:
 
 julia:
   - 1.1
+  - 1.2
   - nightly
 
 notifications:

src/types.jl

@@ -84,7 +84,7 @@ function Query(conn::Connection, sql::String; streaming::Bool=false, kwargs...)
         result = MySQL.Result(MySQL.API.mysql_use_result(conn.ptr))
     else
         resulttype = :default
-        result = result = MySQL.Result(MySQL.API.mysql_store_result(conn.ptr))
+        result = MySQL.Result(MySQL.API.mysql_store_result(conn.ptr))
     end
 
     if result.ptr != C_NULL
@@ -115,7 +115,7 @@ Tables.rows(q::Query) = q
 Tables.schema(q::Query{hasresult, names, T}) where {hasresult, names, T} = Tables.Schema(names, T)
 
 Base.length(q::Query) = q.ptr == C_NULL ? 0 : q.nrows
-Base.eltype(q::Query{hasresult, names, types}) where {hasresult, names, types} = NamedTuple{names, types}
+Base.eltype(q::Query{hasresult, names, types}) where {hasresult, names, types} = NamedTuple{names}
 
 cast(str, ::Type{Union{Missing, T}}) where {T} = cast(str, T)
 cast(str, ::Type{API.Bit}) = API.Bit(isempty(str) ? 0 : UInt64(str[1]))
@@ -131,19 +131,10 @@ function getvalue(ptr, col, ::Type{T}) where {T}
     return deref == C_NULL ? missing : cast(unsafe_string(deref), T)
 end
 
-function generate_namedtuple(::Type{NamedTuple{names, types}}, q) where {names, types}
-    if @generated
-        vals = Tuple(:(getvalue(q.ptr, $i, $(fieldtype(types, i)))) for i = 1:fieldcount(types))
-        return :(NamedTuple{names, types}(($(vals...),)))
-    else
-        return NamedTuple{names, types}(Tuple(getvalue(q.ptr, i, fieldtype(types, i)) for i = 1:fieldcount(types)))
-    end
-end
-
 function Base.iterate(q::Query{resulttype, names, types}, st=1) where {resulttype, names, types}
     st == 1 && resulttype == :none && return (num_rows_affected=Int(q.result.ptr),), 2
     q.ptr == C_NULL && return nothing
-    nt = generate_namedtuple(NamedTuple{names, types}, q)
+    nt = NamedTuple{names}([getvalue(q.ptr, i, fieldtype(types, i)) for i in 1:fieldcount(types)])
     q.ptr = API.mysql_fetch_row(q.result.ptr)
     return nt, st + 1
 end

test/runtests.jl

@@ -122,3 +122,16 @@ res = MySQL.Query(conn, """select * from test;""") |> columntable
 
 @test res.a[1] == "test"
 @test res.b[1] == 123
+
+# issue #130
+MySQL.execute!(conn, """
+    CREATE TABLE issue130 (
+        f1 Int, f2 Int, f3 Int, f4 Int, f5 Int, f6 Int, f7 Int, f8 Int, f9 Int, f10 Int,
+        f11 Int, f12 Int, f13 Int, f14 Int, f15 Int, f16 Int, f17 Int, f18 Int, f19 Int, f20 Int,
+        f21 Int, f22 Int, f23 Int, f24 Int, f25 Int, f26 Int, f27 Int, f28 Int, f29 Int, f30 Int,
+        PRIMARY KEY (f1)
+    );""")
+res = MySQL.Query(conn, "select count(*) from issue130;") |> columntable
+@test res[1][1] == 0
+res = MySQL.Query(conn, "select * from issue130;") |> columntable
+@test isempty(res[1])