Fix binding index and in

Author: Schultzer

lib/parser.ex

@@ -9,6 +9,14 @@ defmodule SQL.Parser do
   def context(?[), do: :"[]"
   def context(?(), do: :"()"
 
+  def type(%param{}), do: param
+  def type(param) when is_float(param), do: :float
+  def type(param) when is_integer(param), do: :integer
+  def type(param) when is_map(param), do: :map
+  def type(param) when is_list(param), do: {:list, Enum.uniq(Enum.map(param, &type/1))}
+  def type(param) when is_binary(param), do: :string
+  def type(_param), do: nil
+
   def type(?., :integer), do: :float
   def type(b, type) when b in ?0..?9 and type in ~w[nil integer float]a, do: type || :integer
   def type(_b, _type), do: :ident
@@ -229,12 +237,12 @@ defmodule SQL.Parser do
         parse(rest, binary, opts, end_line, end_column, nil, data, unit ++ [{:"\#{}", [line: line, column: column, end_line: end_line, end_column: end_column], [result]}], context, metadata, acc, root)
       {rest, end_line, end_column, result} when is_atom(result) ->
         if param = binding[result] do
-          parse(rest, binary, update_in(opts, [:params], &(&1++[param])), end_line, end_column, nil, data, unit ++ [{:binding, [line: line, column: column, end_line: end_line, end_column: end_column], [length(opts[:params])]}], context, metadata, acc, root)
+          parse(rest, binary, update_in(opts, [:params], &(&1++[param])), end_line, end_column, nil, data, unit ++ [{:binding, [type: type(param), line: line, column: column, end_line: end_line, end_column: end_column], [length(opts[:params])+1]}], context, metadata, acc, root)
         else
           raise ArgumentError, "The variable #{result} is not defined"
         end
-      {rest, end_line, end_column, {result, _}} ->
-        parse(rest, binary, update_in(opts, [:params], &(&1++[result])), end_line, end_column, nil, data, unit ++ [{:binding, [line: line, column: column, end_line: end_line, end_column: end_column], [length(opts[:params])]}], context, metadata, acc, root)
+      {rest, end_line, end_column, {param, _}} ->
+        parse(rest, binary, update_in(opts, [:params], &(&1++[param])), end_line, end_column, nil, data, unit ++ [{:binding, [type: type(param), line: line, column: column, end_line: end_line, end_column: end_column], [length(opts[:params])+1]}], context, metadata, acc, root)
     end
   end
   def parse(<<?), rest::binary>>, _binary, opts, line, column, type, data, unit, :"()" = context, metadata, acc, root) do

lib/string.ex

@@ -26,6 +26,9 @@ defmodule SQL.String do
   def token_to_sql({:"\#{}", _, [value]}, _mod) do
     "\#{#{value}}"
   end
+  def token_to_sql({:in, _, [right, {:binding, _, _} = left]}, mod) do
+    "#{mod.token_to_sql(right)} = ANY(#{mod.token_to_sql(left)})"
+  end
   def token_to_sql({tag, _, value}, mod) when tag in ~w[; ,]a do
     "#{mod.token_to_sql(value)}#{mod.token_to_sql(tag)}"
   end

test/sql_test.exs

@@ -42,7 +42,7 @@ defmodule SQLTest do
 
   test "to_sql/1" do
     email = "john@example.com"
-    assert {"select id, email from users where email = $0", ["john@example.com"]} == to_sql(~SQL"""
+    assert {"select id, email from users where email = $1", ["john@example.com"]} == to_sql(~SQL"""
     select id, email
     where email = #{email}
     from users
@@ -51,7 +51,7 @@ defmodule SQLTest do
 
   test "can parse multiple queries" do
     email = "john@example.com"
-    assert {"select id, email where email = $0 from users; select id from users", [email]} == to_sql(~SQL"""
+    assert {"select id, email where email = $1 from users; select id from users", [email]} == to_sql(~SQL"""
     select id, email
     where email = #{email}
     from users;
@@ -282,8 +282,8 @@ defmodule SQLTest do
 
   test "interpolation" do
     var = 1
-    assert [{:select, _, [{:binding, _, [0]}]}] = ~SQL[select #{var}].tokens
-    assert [{:select, _, [{:binding, _, [0]}]}] = ~SQL[select #{
+    assert [{:select, _, [{:binding, _, [1]}]}] = ~SQL[select #{var}].tokens
+    assert [{:select, _, [{:binding, _, [1]}]}] = ~SQL[select #{
       {}
       }].tokens
   end

test/string_test.exs

@@ -195,20 +195,26 @@ defmodule SQL.StringTest do
       assert ["id"] == var2.params
       sql = ~SQL[select #{var2}, #{var1}]
       assert [var2, 1] == sql.params
-      assert "select $0, $1" == to_string(sql)
+      assert "select $1, $2" == to_string(sql)
     end
 
     test ". syntax" do
       map = %{k: "v"}
       sql = ~SQL[select #{map.k <> "v"}]
       assert ["vv"] == sql.params
-      assert "select $0" == to_string(sql)
+      assert "select $1" == to_string(sql)
     end
 
     test "code" do
       sql = ~SQL[select #{0}, #{%{k: 1}}]
       assert [0, %{k: 1}] == sql.params
-      assert "select $0, $1" == to_string(sql)
+      assert "select $1, $2" == to_string(sql)
+    end
+
+    test "in" do
+      sql = ~SQL"select #{1} in #{[1, 2]}"
+      assert [1, [1, 2]] == sql.params
+      assert "select $1 = ANY($2)" == to_string(sql)
     end
   end