diff --git a/src/QuerySQLite.jl b/src/QuerySQLite.jl index 8873c58..2ad8544 100644 --- a/src/QuerySQLite.jl +++ b/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, maximum, minimum, max, min, occursin, rand, replace, repr, round, show, showerror, startswith, string, strip, SubString, uppercase using Base: Generator, NamedTuple, RefValue, SizeUnknown, tail using Base.Meta: quot diff --git a/src/code_instead.jl b/src/code_instead.jl index 8af30df..340495e 100644 --- a/src/code_instead.jl +++ b/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 diff --git a/src/translate.jl b/src/translate.jl index f7dd6a5..587bb06 100644 --- a/src/translate.jl +++ b/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( diff --git a/test/runtests.jl b/test/runtests.jl index f78f86b..f8cf3b0 100644 --- a/test/runtests.jl +++ b/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 |>