Fix deprecations

queryverse · Aug 10, 2018 · f514811 · f514811
1 parent 5406169
commit f514811
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/scalar/core.jl b/src/scalar/core.jl
@@ -84,7 +84,7 @@ Base.getindex(x::DataValue) = isna(x) ? throw(DataValueException()) : x.value
 Base.get(x::DataValue{Union{}}) = throw(DataValueException())
 Base.get(x::DataValue{Union{}}, y) = y
 
-Base.unsafe_get(x::DataValue) = x.value
+unsafe_get(x::DataValue) = x.value
 
 isna(x) = false
 isna(x::DataValue) = !x.hasvalue
@@ -124,10 +124,9 @@ Base.zero(x::DataValues.DataValue{T}) where {T<:Dates.Period}= DataValue{T}(zero
 
 # Strings
 
-for op in (:lowercase,:uppercase,:reverse,:ucfirst,:lcfirst,:chop,:chomp)
+for op in (:lowercase,:uppercase,:reverse,:uppercasefirst,:lowercasefirst,:chop,:chomp)
     @eval begin
-        import Base.$(op)
-        function $op(x::DataValue{T}) where {T <: AbstractString}
+        function Base.$op(x::DataValue{T}) where {T <: AbstractString}
             if isna(x)
                 return DataValue{T}()
             else

diff --git a/src/scalar/operations.jl b/src/scalar/operations.jl
@@ -36,8 +36,7 @@ for f in (:(Base.acos), :(Base.acosh), :(Base.asin), :(Base.asinh),
         :(Base.atan), :(Base.atanh), :(Base.sin), :(Base.sinh), :(Base.cos),
         :(Base.cosh), :(Base.tan), :(Base.tanh), :(Base.exp), :(Base.exp2),
         :(Base.expm1), :(Base.log), :(Base.log10), :(Base.log1p),
-        :(Base.log2), :(Base.exponent), :(Base.sqrt), :(Base.gamma),
-        :(Base.lgamma), :(Dates.value))
+        :(Base.log2), :(Base.exponent), :(Base.sqrt), :(Dates.value))
     @eval begin
         function $f(a::DataValue{T}) where {T}
             if isna(a)

diff --git a/test/scalar/test_core.jl b/test/scalar/test_core.jl
@@ -31,7 +31,7 @@ end
 @test get(DataValue("test"), "default") == "test"
 @test get(DataValue{String}(), "default") == "default"
 
-@test unsafe_get(DataValue(3)) == 3
+@test DataValues.unsafe_get(DataValue(3)) == 3
 
 end