Merge pull request #31 from queryverse/issue29

minimum and maximum

Author: bramtayl

src/QuerySQLite.jl

@@ -1,7 +1,7 @@
 module QuerySQLite
 
 import Base: !, &, |, ==, !=, *, /, +, -, %, abs, Char, coalesce, collect, convert, eltype, getproperty, length,
-lowercase, in, isdone, isequal, isless, ismissing, iterate, IteratorSize, join, max, min,
+lowercase, in, isdone, isequal, isless, ismissing, iterate, IteratorSize, join, max, min, maximum, minimum,
 occursin, rand, replace, repr, round, show, showerror, startswith, string, strip, SubString, uppercase
 using Base: Generator, NamedTuple, RefValue, SizeUnknown, tail
 using Base.Meta: quot

src/code_instead.jl

@@ -201,10 +201,12 @@ end
 @code_instead QueryOperators.join SourceCode SourceCode Any Expr Any Expr Any Expr
 
 @code_instead max SourceCode Vararg{Any}
+@code_instead maximum SourceCode
 
 @code_instead mean SourceCode
 
 @code_instead min SourceCode Vararg{Any}
+@code_instead minimum SourceCode
 
 @code_instead length SourceCode
 

src/translate.jl

@@ -186,10 +186,12 @@ function translate_call(::typeof(QueryOperators.map), select_table, call, call_e
 end
 
 @translate_default ::typeof(max) :max
+@translate_default ::typeof(maximum) :max
 
 @translate_default ::typeof(mean) :AVG
 
 @translate_default ::typeof(min) :min
+@translate_default ::typeof(minimum) :min
 
 translate_call(::typeof(occursin), needle, haystack; _primary = true) =
     SQLExpression(

test/runtests.jl

@@ -85,8 +85,8 @@ group_by_row =
         AlbumId = key(_),
         length = length(_.AlbumId),
         sum = sum(_.Milliseconds),
-        min = min(_.Milliseconds),
-        max = max(_.Milliseconds),
+        min = minimum(_.Milliseconds),
+        max = maximum(_.Milliseconds),
         mean = mean(_.Milliseconds)
     }) |>
     collect |>