fix

Author: bramtayl

src/database.jl

@@ -28,10 +28,10 @@ struct Database{Source}
 end
 
 function Database(filename::AbstractString)
-    if endswith(filename, "sqlite")
+    if endswith(filename, ".sqlite")
         Database(SQLite.DB(filename))
     else
-        error("Unsupported database type for $filename")
+        throw(ArgumentError("Unsupported database type for $filename"))
     end
 end
 

src/show.jl

@@ -5,6 +5,14 @@ function prefix(io, call, argument1)
     print(io, argument1)
 end
 
+function parenthesize_prefix(io, call, argument1)
+    print(io, call)
+    print(io, ' ')
+    print(io, '(')
+    print(io, argument1)
+    print(io, ')')
+end
+
 function postfix(io, call, argument1)
     print(io, argument1)
     print(io, ' ')
@@ -17,6 +25,14 @@ function tight_infix(io, call, argument1, argument2)
     print(io, argument2)
 end
 
+function parenthesize_infix(io, call, argument1, argument2)
+    print(io, argument1)
+    print(io, ' ')
+    print(io, call)
+    print(io, ' ')
+    print(io, argument2)
+end
+
 function infix(io, call, argument1, argument2, arguments...)
     print(io, argument1)
     print(io, ' ')
@@ -89,13 +105,13 @@ function show(io::IO, sql_expression::SQLExpression)
     elseif call === :AND
         infix(io, call, arguments...)
     elseif call === :AS
-        infix(io, call, arguments...)
+        parenthesize_infix(io, call, arguments...)
     elseif call === :CASE
         case(io, call, arguments...)
     elseif call === :DESC
         postfix(io, call, arguments...)
     elseif call === :FROM
-        prefix(io, call, arguments...)
+        parenthesize_prefix(io, call, arguments...)
     elseif call === Symbol("GROUP BY")
         head_call_tail(io, call, arguments...)
     elseif call === :IN

src/translate.jl

@@ -95,7 +95,12 @@ function translate_call(::typeof(QueryOperators.groupby), ungrouped, group_funct
     # TODO: map_selector
     model = model_row(ungrouped)
     SQLExpression(Symbol("GROUP BY"),
-        translate(ungrouped; primary = primary),
+        SQLExpression(:AS, SQLExpression(:FROM, translate_call(
+            QueryOperators.map,
+            ungrouped,
+            map_selector, map_function_expression,
+            primary = primary
+        )), :__TABLE__),
         translate(group_function(model).code; primary = primary)
     )
 end

test/runtests.jl

@@ -57,13 +57,14 @@ database2 = Database(DB(filename))
     @map({AlbumId = key(_), Count = length(_.AlbumId)}) |>
     collect |>
     first).Count == 10
+
 end
 
 @testset "Systematic tests" begin
 
 filename = joinpath(@__DIR__, "test.sqlite")
 connection = DB(filename)
-
+execute!(Stmt(connection, """DROP TABLE IF EXISTS test"""))
 execute!(Stmt(connection, """
     CREATE TABLE test (
         a Int,
@@ -74,7 +75,6 @@ execute!(Stmt(connection, """
     INSERT INTO test VALUES(0, 1, -1)
 """))
 database = Database(connection)
-
 result =
     database.test |>
     @map({
@@ -86,7 +86,8 @@ result =
         h = _.a * _.b,
         i = _.a + _.b,
         j = _.a % _.b,
-        k = abs(_.c)
+        k = abs(_.c),
+        l = _.a in (0, 1)
     }) |>
     collect |>
     first
@@ -100,7 +101,10 @@ result =
 @test result.i == 1
 @test result.j == 0
 @test result.k == 1
+@test result.l == 1
 
 drop!(connection, "test")
 
+@test_throws ArgumentError Database("file.not_sqlite")
+
 end