Merge pull request #11 from tsloughter/type-casts-fix

handle type casts when parsing named params
artemeff · Nov 12, 2017 · 0741484 · 0741484
2 parents a7bc4ab + 413128b
commit 0741484
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/examples/queries.sql b/examples/queries.sql
@@ -1,4 +1,3 @@
-
 --
 -- Get all users from database
 -- :get_all_users
@@ -14,3 +13,7 @@ users WHERE id = ?
 -- name: get_all_schema_users
 SELECT *
 FROM :schema.users
+
+--
+-- name: accept_type_casts
+select '[{"a":"foo"},{"b":"bar"},{"c":"baz"}]'::json->2
diff --git a/src/eql_parse.erl b/src/eql_parse.erl
@@ -82,11 +82,11 @@ lists:map(fun({param, P}) -> binary_to_atom(iolist_to_binary(P), utf8);
 
 -spec 'substatement'(input(), index()) -> parse_result().
 'substatement'(Input, Index) ->
-  p(Input, Index, 'substatement', fun(I,D) -> (p_zero_or_more(p_seq([p_not(p_string(<<":">>)), p_not(fun 'comment_marker'/2), p_anything()])))(I,D) end, fun(Node, _Idx) ->Node end).
+  p(Input, Index, 'substatement', fun(I,D) -> (p_zero_or_more(p_seq([p_choose([p_not(p_string(<<":">>)), p_string(<<"::">>), p_seq([p_string(<<":">>), p_not(p_charclass(<<"[a-zA-Z0-9_-]">>))])]), p_not(fun 'comment_marker'/2), p_anything()])))(I,D) end, fun(Node, _Idx) ->Node end).
 
 -spec 'param'(input(), index()) -> parse_result().
 'param'(Input, Index) ->
-  p(Input, Index, 'param', fun(I,D) -> (p_seq([p_string(<<":">>), p_label('key', p_one_or_more(p_seq([p_not(p_string(<<"\s">>)), p_not(p_string(<<".">>)), p_not(fun 'crlf'/2), p_anything()])))]))(I,D) end, fun(Node, _Idx) ->proplists:get_value(key, Node) end).
+  p(Input, Index, 'param', fun(I,D) -> (p_seq([p_string(<<":">>), p_label('key', p_one_or_more(p_charclass(<<"[a-zA-Z0-9_-]">>)))]))(I,D) end, fun(Node, _Idx) ->proplists:get_value(key, Node) end).
 
 -spec 'comment_marker'(input(), index()) -> parse_result().
 'comment_marker'(Input, Index) ->

diff --git a/src/eql_parse.peg b/src/eql_parse.peg
@@ -44,7 +44,7 @@ lists:map(fun({param, P}) -> binary_to_atom(iolist_to_binary(P), utf8);
           end, lists:flatten(Node))
 `;
 
-substatement <- (!':' !comment_marker .)* ~;
+substatement <- ((!':' / "::" / ":" ![a-zA-Z0-9_-] ) !comment_marker .)* ~;
 
 param <- ":" key:([a-zA-Z0-9_-])+ `proplists:get_value(key, Node)`;
 

diff --git a/test/eql_compiler_tests.erl b/test/eql_compiler_tests.erl
@@ -37,7 +37,8 @@ test_file() ->
     {ok, Queries} = eql_parse:parse(Source),
     ?assertMatch([ {get_all_users, <<"SELECT * FROM users">>}
                  , {get_user_by_id, <<"SELECT * FROM users WHERE id = ?">>}
-                 , {get_all_schema_users, [<<"SELECT * FROM ">>, schema, <<".users">>]}], Queries).
+                 , {get_all_schema_users, [<<"SELECT * FROM ">>, schema, <<".users">>]}
+                 , {accept_type_casts, <<"select '[{\"a\":\"foo\"},{\"b\":\"bar\"},{\"c\":\"baz\"}]'::json->2">>}], Queries).
 
 test_file_namespace() ->
     eql:new_tab(test_tab),