Merge pull request #3 from JuliaData/jq/dv

Allow DataAPI itself to own datavaluetype, nondatavaluetype, and unwrap

Author: quinnj

src/DataAPI.jl

@@ -72,11 +72,14 @@ For a type `T`, return the corresponding non-`DataValue` type, translating betwe
 For example, `nondatavaluetype(Int64)` returns `Int64`, while
 `nondatavaluetype(DataValue{Int64})` returns `Union{Int64, Missing}`.
 
-This generic function is owned by Tables.jl, which is the sole provider of the default
-definition.
+This generic function is owned by DataAPI.jl itself, which is the sole provider of the
+default definition.
 """
 function nondatavaluetype end
 
+nondatavaluetype(::Type{T}) where {T} = T
+nondatavaluetype(::Type{Union{}}) = Union{}
+
 """
     datavaluetype(T)
 
@@ -86,21 +89,26 @@ For a type `T`, return the corresponding `DataValue` type, translating between
 For example, `datavaluetype(Int64)` returns `Int64`, while
 `datavaluetype(Union{Int64, Missing})` returns `DataValue{Int64}`.
 
-This generic function is owned by Tables.jl, which is the sole provider of the default
-definition.
+This generic function is owned by DataAPI.jl itself, which is the sole provider of the
+default definition.
 """
 function datavaluetype end
 
+datavaluetype(::Type{T}) where {T} = T
+datavaluetype(::Type{Union{}}) = Union{}
+
 """
     unwrap(x)
 
 For a value `x`, potentially "unwrap" it from a `DataValue` or similar container.
 
-This generic function is owned by Tables.jl, which is the sole provider of the default
-definition.
+This generic function is owned by DataAPI.jl itself, which is the sole provider of the
+default definition.
 """
 function unwrap end
 
+unwrap(x) = x
+
 """
     describe(io::IO, x)
 

test/runtests.jl

@@ -27,12 +27,23 @@ end
 
 end
 
-@testset "generic functions" begin
+@testset "nondatavaluetype" begin
 
-    @test length(methods(DataAPI.nondatavaluetype)) == 0
-    @test length(methods(DataAPI.datavaluetype)) == 0
-    @test length(methods(DataAPI.unwrap)) == 0
-    @test length(methods(DataAPI.describe)) == 0
+    @test DataAPI.nondatavaluetype(Int64) == Int64
+    @test DataAPI.nondatavaluetype(Union{}) == Union{}
+
+end
+
+@testset "datavaluetype" begin
+
+    @test DataAPI.datavaluetype(Int64) == Int64
+    @test DataAPI.datavaluetype(Union{}) == Union{}
+
+end
+
+@testset "unwrap" begin
+
+    @test DataAPI.unwrap(1) == 1
 
 end