Skip to content

Handle call tuples nested in call Params list #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ptrf wants to merge 6 commits into from
Closed

Handle call tuples nested in call Params list #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
408d3f1
Call expr/2 on call tuple in param/1
ptrf Jul 22, 2015
368fdaa
Match call tuples in {Key, Value} case of param/1
ptrf Jul 22, 2015
359ef10
Added eunit test cases for nested call handling
ptrf Jul 22, 2015
680356b
(Unrelated) whitespace fix for failing eunit test
ptrf Jul 22, 2015
8c98e63
Added rudimentary OVER support
ptrf Oct 28, 2015
16a9b45
Added rudimentary support for (SELECT ..) AS foo
ptrf Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/sqerl.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,24 @@ expr({Table, Field}, _Safe) when is_atom(Table), is_atom(Field) ->
[convert(Table), $., convert(Field)];
expr({Expr1, as, Alias}, Safe) when is_atom(Alias) ->
[expr2(Expr1, Safe), <<" AS ">>, convert(Alias)];
expr({select, _} = Subquery, Safe) ->
[$(, sql2(Subquery, Safe), $) ];
expr({select, _, _} = Subquery, Safe) ->
[$(, sql2(Subquery, Safe), $)];
expr({select, _, _, _} = Subquery, Safe) ->
[$(, sql2(Subquery, Safe), $)];
expr({select, _, _, _, _} = Subquery, Safe) ->
[$(, sql2(Subquery, Safe), $)];
expr({select, _, _, _, _, _} = Subquery, Safe) ->
[$(, sql2(Subquery, Safe), $)];
expr({select, _, _, _, _, _, _} = Subquery, Safe) ->
[$(, sql2(Subquery, Safe), $)];
expr({call, FuncName, []}, _Safe) ->
[convert(FuncName), <<"()">>];
expr({call, FuncName, Params}, _Safe) ->
[convert(FuncName), $(, make_list(Params, fun param/1), $)];
expr({over, Left, Right}, Safe) ->
[expr2(Left, Safe), <<" OVER ">>, $(, extra_clause(Right, Safe) ,$)];
expr({Val, Op, {select, _} = Subquery}, Safe) ->
subquery(Val, Op, Subquery, Safe);
expr({Val, Op, {select, _, _} = Subquery}, Safe) ->
Expand Down Expand Up @@ -429,9 +443,16 @@ expr2(Expr, _Safe) when is_atom(Expr) -> convert(Expr);
expr2(Expr, Safe) -> expr(Expr, Safe).

param({Key, Value}) when is_atom(Key) ->
[convert(Key), <<" := ">>, encode(Value)];
case Value of
{call, _FuncName, _Params} = Call ->
[convert(Key), <<" := ">>, expr(Call, undefined)];
_ ->
[convert(Key), <<" := ">>, encode(Value)]
end;
param(Key) when is_atom(Key) ->
convert(Key);
param({call, _FuncName, _Params} = Call) ->
expr(Call, undefined);
param(Value) ->
encode(Value).

Expand Down
20 changes: 18 additions & 2 deletions test/sqerl_tests.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ safe_test_() ->
{select,distinct,name,{from,gymnast}}}}})
},

{<<"SELECT name FROM developer WHERE name IN ((SELECT DISTINCT name FROM gymnast)"
"UNION (SELECT name FROM dancer WHERE ((name LIKE 'Mikhail%') OR (country = 'Russia')))"
{<<"SELECT name FROM developer WHERE name IN ((SELECT DISTINCT name FROM gymnast) "
"UNION (SELECT name FROM dancer WHERE ((name LIKE 'Mikhail%') OR (country = 'Russia'))) "
"WHERE (name LIKE 'M%') ORDER BY name DESC LIMIT 5, 10)">>,
?_safe_test({select,name,
{from,developer},
Expand Down Expand Up @@ -186,6 +186,14 @@ safe_test_() ->

{<<"SELECT name FROM search_people(age := 18)">>,
?_safe_test({select,name,{from,{call,search_people,[{age, 18}]}}})
},

{<<"SELECT * FROM search_people(age := 18, area := postal_area(code := 1234))">>,
?_safe_test({select,'*',{from,{call,search_people,[{age, 18},{area,{call,postal_area,[{code, 1234}]}}]}}})
},

{<<"SELECT * FROM outer_function(column1, inner_function())">>,
?_safe_test({select,'*',{from,{call,outer_function,[column1,{call,inner_function,[]}]}}})
}
]
}.
Expand Down Expand Up @@ -280,6 +288,14 @@ unsafe_test_() ->

{<<"SELECT NOT (foo = bar)">>,
?_unsafe_test({select,{'!',"foo = bar"}})
},

{<<"SELECT row_number() OVER ( ORDER BY id DESC), bar FROM lol">>,
?_unsafe_test({select, [{over, {call, row_number, []}, {order_by, [{id, desc}]}}, bar], {from, lol}})
},

{<<"SELECT foo FROM (SELECT foo FROM bar) AS baz">>,
?_unsafe_test({select, [foo], {from, {{select, [foo], {from, bar}}, as, baz}}})
}
]
}.