Merge pull request #39 from JuliaDB/fixtests

Fix JSON test
JuliaDatabases · Jun 23, 2016 · 0d13f02 · 0d13f02
2 parents 218ea68 + 206795e
commit 0d13f02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/types.jl b/src/types.jl
@@ -180,11 +180,11 @@ function pgdata(::Type{PostgresType{:unknown}}, ptr::Ptr{UInt8}, data)
     ptr = storestring!(ptr, string(data))
 end
 
-function pgdata(::Type{PostgresType{:json}}, ptr::Ptr{UInt8}, data::Dict{AbstractString,Any})
+function pgdata{T<:AbstractString}(::Type{PostgresType{:json}}, ptr::Ptr{UInt8}, data::Dict{T,Any})
     ptr = storestring!(ptr, bytestring(JSON.json(data)))
 end
 
-function pgdata(::Type{PostgresType{:jsonb}}, ptr::Ptr{UInt8}, data::Dict{AbstractString,Any})
+function pgdata{T<:AbstractString}(::Type{PostgresType{:jsonb}}, ptr::Ptr{UInt8}, data::Dict{T,Any})
     ptr = storestring!(ptr, bytestring(JSON.json(data)))
 end
 

diff --git a/test/data.jl b/test/data.jl
@@ -62,11 +62,10 @@ end
 function test_json()
     PGType = PostgreSQL.PostgresType
     for typ in Any[PGType{:json}, PGType{:jsonb}]
-        dict1 = @compat Dict{AbstractString,Any}("bobr dobr" => [1, 2, 3])
+        dict1 = @compat Dict("bobr dobr" => [1, 2, 3], "foo" => 3.0)
         p = PostgreSQL.pgdata(typ, convert(Ptr{UInt8}, C_NULL), dict1)
         try
             dict2 = PostgreSQL.jldata(typ, p)
-            @test typeof(dict1) == typeof(dict2)
             @test dict1 == dict2
         finally
             Libc.free(p)