misc local changes

Author: bramtayl

src/QueryOperators.jl

@@ -6,7 +6,7 @@ function as(new_name_model_row::Pair{Symbol, <: SourceCode}; options...)
 end
 
 @code_instead QueryOperators.drop SourceCode Integer
-@translate ::typeof(QueryOperators.drop) :OFFSET
+@translate_default ::typeof(QueryOperators.drop) :OFFSET
 
 @code_instead QueryOperators.filter SourceCode Any Expr
 function translate_dispatch(::typeof(QueryOperators.filter), iterator, call, call_expression; options...)
@@ -16,6 +16,14 @@ function translate_dispatch(::typeof(QueryOperators.filter), iterator, call, cal
     )
 end
 
+@code_instead QueryOperators.groupby SourceCode Any Expr Any Expr
+function translate_dispatch(::typeof(QueryOperators.groupby), ungrouped, group_function, group_function_expression, map_selector, map_function_expression; options...)
+    SQLExpression(Symbol("GROUP BY"),
+        translate(ungrouped; options...),
+        translate(group_function(model_row(ungrouped)).code; options...)
+    )
+end
+
 @code_instead QueryOperators.join SourceCode SourceCode Any Expr Any Expr Any Expr
 function translate_dispatch(::typeof(QueryOperators.join), source1, source2, key1, key1_expression, key2, key2_expression, combine, combine_expression; options...)
     model_row_1 = model_row(source1; other = true)
@@ -88,7 +96,7 @@ function translate_dispatch(::typeof(QueryOperators.map), select_table, call, ca
 end
 
 @code_instead QueryOperators.take SourceCode Any
-@translate ::typeof(QueryOperators.take) :LIMIT
+@translate_default ::typeof(QueryOperators.take) :LIMIT
 
 @code_instead QueryOperators.unique SourceCode Any Expr
 function translate_dispatch(::typeof(QueryOperators.unique), repeated, key_function, key_function_expression; options...)

src/library.jl

@@ -1,28 +1,28 @@
 @code_instead (==) SourceCode Any
 @code_instead (==) Any SourceCode
 @code_instead (==) SourceCode SourceCode
-@translate ::typeof(==) :(=)
+@translate_default ::typeof(==) :(=)
 
 @code_instead (!=) SourceCode Any
 @code_instead (!=) Any SourceCode
 @code_instead (!=) SourceCode SourceCode
-@translate ::typeof(!=) Symbol("<>")
+@translate_default ::typeof(!=) Symbol("<>")
 
 @code_instead (!) SourceCode
-@translate ::typeof(!) :NOT
+@translate_default ::typeof(!) :NOT
 
 @code_instead (&) SourceCode Any
 @code_instead (&) Any SourceCode
 @code_instead (&) SourceCode SourceCode
-@translate ::typeof(&) :AND
+@translate_default ::typeof(&) :AND
 
 @code_instead (|) SourceCode Any
 @code_instead (|) Any SourceCode
 @code_instead (|) SourceCode SourceCode
-@translate ::typeof(|) :OR
+@translate_default ::typeof(|) :OR
 
 @code_instead coalesce SourceCode Vararg{Any}
-@translate ::typeof(coalesce) :COALESCE
+@translate_default ::typeof(coalesce) :COALESCE
 
 function get_column(source_row, column_name)
     SourceCode(source_row.source, Expr(:call, getproperty, source_row, column_name))
@@ -82,25 +82,25 @@ export if_else
 @code_instead if_else SourceCode Any SourceCode
 @code_instead if_else SourceCode SourceCode Any
 @code_instead if_else SourceCode SourceCode SourceCode
-@translate ::typeof(if_else) :IF
+@translate_default ::typeof(if_else) :IF
 
 @code_instead in SourceCode Any
 @code_instead in Any SourceCode
 @code_instead in SourceCode SourceCode
-@translate ::typeof(in) :IN
+@translate_default ::typeof(in) :IN
 
 @code_instead isequal SourceCode Any
 @code_instead isequal Any SourceCode
 @code_instead isequal SourceCode SourceCode
-@translate ::typeof(isequal) Symbol("IS NOT DISTINCT FROM")
+@translate_default ::typeof(isequal) Symbol("IS NOT DISTINCT FROM")
 
 @code_instead isless SourceCode Any
 @code_instead isless Any SourceCode
 @code_instead isless SourceCode SourceCode
-@translate ::typeof(isless) :<
+@translate_default ::typeof(isless) :<
 
 @code_instead ismissing SourceCode
-@translate ::typeof(ismissing) Symbol("IS NULL")
+@translate_default ::typeof(ismissing) Symbol("IS NULL")
 
 @code_instead occursin AbstractString SourceCode
 @code_instead occursin Regex SourceCode
@@ -116,7 +116,7 @@ translate_dispatch(::typeof(occursin), needle::Regex, haystack; options...) =
         translate(haystack; options...),
         replace(replace(needle.pattern, r"(?<!\\)\.\*" => "%"), r"(?<!\\)\." => "_")
     )
-@translate ::typeof(occursin) :LIKE
+@translate_default ::typeof(occursin) :LIKE
 
 @code_instead startswith SourceCode Any
 @code_instead startswith Any SourceCode

src/translate.jl

@@ -87,6 +87,6 @@ function translate_default(location, function_type, SQL_call)
     result
 end
 
-macro translate(a_function, SQL_call)
+macro translate_default(a_function, SQL_call)
     translate_default(__source__, a_function, SQL_call) |> esc
 end

test/runtests.jl

@@ -52,4 +52,8 @@ database2 = Database(SQLite.DB(filename))
     DataTable |>
     length == 347
 
+# database.Track |>
+#     @groupby(_.AlbumId) |>
+#     @map({AlbumId = key(_), Count = length(_)})
+
 end