refactor parser and remove deprecated code

closes #21

Author: Schultzer

lib/adapters/ansi.ex

@@ -14,27 +14,41 @@ defmodule SQL.Adapters.ANSI do
   def token_to_string(value, _mod) when is_struct(value) do
     to_string(value)
   end
-  def token_to_string({:*, _, []}, _mod) do
-    "*"
+  def token_to_string({:as, [], [left, right]}, mod) do
+    "#{mod.token_to_string(left)} #{mod.token_to_string(right)}"
+  end
+  def token_to_string({tag, _, [left]}, mod) when tag in ~w[asc desc isnull notnull]a do
+    "#{mod.token_to_string(left)} #{mod.token_to_string(tag)}"
   end
   def token_to_string({:fun, _, [left, right]}, mod) do
     "#{mod.token_to_string(left)}#{mod.token_to_string(right)}"
   end
-  def token_to_string({tag, _, [{:paren, _, _} = value]}, mod) when tag in ~w[numeric update]a do
-    "#{mod.token_to_string(tag)}#{mod.token_to_string(value)}"
-  end
   def token_to_string({:ident, [{:keyword, :non_reserved},{:tag, tag}|_], [{:paren, _, _} = value]}, mod) do
     "#{mod.token_to_string(tag)}#{mod.token_to_string(value)}"
   end
   def token_to_string({:ident, [{:keyword, :non_reserved}, {:tag, tag}|_], [{:numeric, _, _} = value]}, mod) do
     "#{mod.token_to_string(tag)} #{mod.token_to_string(value)}"
   end
-  def token_to_string({_tag, [{:keyword, :non_reserved}|_], value}, mod) do
-    "#{mod.token_to_string(value)}"
+  def token_to_string({:ident, [{:keyword, :non_reserved}, {:tag, tag}|_], _}, mod) do
+      mod.token_to_string(tag)
   end
-  def token_to_string({:numeric = tag, _, []}, mod), do: mod.token_to_string(tag)
-  def token_to_string({tag, _, value}, _mod) when tag in ~w[ident numeric]a do
-    value
+  def token_to_string({tag, [{:keyword, :reserved}|_], [{:paren, _, _} = value]}, mod) when tag not in ~w[on as in select]a do
+    "#{mod.token_to_string(tag)}#{mod.token_to_string(value)}"
+  end
+  def token_to_string({tag, [{:keyword, :reserved}|_], []}, mod) do
+    mod.token_to_string(tag)
+  end
+  def token_to_string({tag, _, [left, {:all = t, _, right}]}, mod) when tag in ~w[union except intersect]a do
+    "#{mod.token_to_string(left)} #{mod.token_to_string(tag)} #{mod.token_to_string(t)} #{mod.token_to_string(right)}"
+  end
+  def token_to_string({:between = tag, _, [{:not = t, _, right}, left]}, mod) do
+    "#{mod.token_to_string(right)} #{mod.token_to_string(t)} #{mod.token_to_string(tag)} #{mod.token_to_string(left)}"
+  end
+  def token_to_string({:binding, _, [idx]}, _mod) when is_integer(idx) do
+    "?"
+  end
+  def token_to_string({:binding, _, value}, _mod) do
+    "{{#{value}}}"
   end
   def token_to_string({:comment, _, value}, _mod) do
     "--#{value}"
@@ -55,83 +69,45 @@ defmodule SQL.Adapters.ANSI do
     "[#{mod.token_to_string(value)}]"
   end
   def token_to_string({:colon, _, value}, mod) do
-    "; #{mod.token_to_string(value)}"
+    "#{mod.token_to_string(value)};"
   end
   def token_to_string({:comma, _, value}, mod) do
     ", #{mod.token_to_string(value)}"
   end
   def token_to_string({:dot, _, [left, right]}, mod) do
     "#{mod.token_to_string(left)}.#{mod.token_to_string(right)}"
   end
-  def token_to_string({tag, _, []}, mod) do
-    mod.token_to_string(tag)
-  end
-  def token_to_string({:join=tag, _, [right]}, mod) do
-    "#{mod.token_to_string(tag)} #{mod.token_to_string(right)}"
-  end
-  def token_to_string({:join=tag, _, [{t, [{:keyword, :reserved}|_], _}=p, p1, p2, right]}, mod) when t != :as do
-    "#{mod.token_to_string(p)} #{mod.token_to_string(p1)} #{mod.token_to_string(p2)} #{mod.token_to_string(tag)} #{mod.token_to_string(right)}"
-  end
-  def token_to_string({:join=tag, _, [{t, [{:keyword, :reserved}|_], _}=p, p1, right]}, mod) when t != :as do
-    "#{mod.token_to_string(p)} #{mod.token_to_string(p1)} #{mod.token_to_string(tag)} #{mod.token_to_string(right)}"
-  end
-  def token_to_string({:join=tag, _, [{t, [{:keyword, :reserved}|_], _}=left, right]}, mod) when t != :as do
-    "#{mod.token_to_string(left)} #{mod.token_to_string(tag)} #{mod.token_to_string(right)}"
-  end
-  def token_to_string({tag, _, [{:with = t, _, [left, right]}]}, mod) when tag in ~w[to]a do
-    "#{mod.token_to_string(tag)} #{mod.token_to_string(left)} #{mod.token_to_string(t)} #{mod.token_to_string(right)}"
-  end
-  def token_to_string({tag, _, value}, mod) when tag in ~w[select from fetch limit where order offset group having with join by distinct create type drop insert alter table add into delete update start grant revoke set declare open close commit rollback references recursive outer]a do
-    "#{mod.token_to_string(tag)} #{mod.token_to_string(value)}"
-  end
-  def token_to_string({:on = tag, _, [source, as, value]}, mod) do
-    "#{mod.token_to_string(source)} #{mod.token_to_string(as)} #{mod.token_to_string(tag)} #{mod.token_to_string(value)}"
+  def token_to_string({tag, _, value}, _mod) when tag in ~w[ident numeric]a do
+    "#{value}"
   end
-  def token_to_string({:not = tag, _, [ident | values]}, mod) when values != [] do
-    "#{mod.token_to_string(ident)} #{mod.token_to_string(tag)} #{mod.token_to_string(values)}"
+  def token_to_string(value, _mod) when is_atom(value) do
+    "#{value}"
   end
-  def token_to_string({tag, _, [left, [{:all = t, _, right}]]}, mod) when tag in ~w[union except intersect]a do
-    "#{mod.token_to_string(left)} #{mod.token_to_string(tag)} #{mod.token_to_string(t)} #{mod.token_to_string(right)}"
+  def token_to_string(value, _mod) when is_binary(value) do
+    "'#{value}'"
   end
-  def token_to_string({:between = tag, _, [{:not = t, _, right}, left]}, mod) do
-    "#{mod.token_to_string(right)} #{mod.token_to_string(t)} #{mod.token_to_string(tag)} #{mod.token_to_string(left)}"
+  def token_to_string(value, _mod) when is_integer(value) do
+    [value]
   end
-  def token_to_string({tag, _, [left, right]}, mod) when tag in ~w[:: [\] <> <= >= != || + - ^ * / % < > = like ilike as union except intersect between and or on is not in cursor for to]a do
+  def token_to_string({tag, _, [left, right]}, mod) when tag in ~w[:: [\] <> <= >= != || + - ^ * / % < > = like ilike as union except intersect between and or is not in cursor for to]a do
     "#{mod.token_to_string(left)} #{mod.token_to_string(tag)} #{mod.token_to_string(right)}"
   end
-  def token_to_string({tag, _, [{:paren, _, _} = value]}, mod) when tag not in ~w[in on]a do
-    "#{mod.token_to_string(tag)}#{mod.token_to_string(value)}"
-  end
-  def token_to_string({tag, _, values}, mod) when tag in ~w[not all between asymmetric symmetric absolute relative forward backward on in for without]a do
+  def token_to_string({tag, [{:keyword, :reserved}|_], values}, mod) do
     "#{mod.token_to_string(tag)} #{mod.token_to_string(values)}"
   end
-  def token_to_string({tag, _, [left]}, mod) when tag in ~w[asc desc isnull notnull not]a do
-    "#{mod.token_to_string(left)} #{mod.token_to_string(tag)}"
-  end
-  def token_to_string({:binding, _, [idx]}, _mod) when is_integer(idx) do
-    "?"
-  end
-  def token_to_string({:binding, _, value}, _mod) do
-    "{{#{value}}}"
-  end
-  def token_to_string(:*, _mod) do
-    "*"
-  end
-  def token_to_string(value, _mod) when is_atom(value) do
-    "#{value}"
+  def token_to_string({tag, [{:keyword, :non_reserved}|_], values}, mod) when tag != :ident do
+    "#{mod.token_to_string(tag)} #{mod.token_to_string(values)}"
   end
-  def token_to_string(value, _mod) when is_binary(value) do
-    "'#{value}'"
+  def token_to_string({tag, _, []}, mod) do
+    mod.token_to_string(tag)
   end
-  def token_to_string([h|_]=values, mod) when is_tuple(h) or is_tuple(hd(h)) do
+  def token_to_string(values, mod) do
     values
     |> Enum.reduce([], fn
-      token, [] = acc -> [acc,mod.token_to_string(token, mod)]
-      {:comma, _, _} = token, acc -> [acc,mod.token_to_string(token, mod)]
-      token, acc -> [acc," ",mod.token_to_string(token, mod)]
+      [], acc -> acc
+      token, [] -> [mod.token_to_string(token)]
+      {:comma, _, _} = token, acc -> [acc,mod.token_to_string(token)]
+      token, acc -> [acc, " ", mod.token_to_string(token)]
     end)
   end
-  def token_to_string(value, _mod) do
-    value
-  end
 end

lib/lexer.ex

@@ -177,30 +177,15 @@ defmodule SQL.Lexer do
   def update_state(rest, file, params, binding, aliases, _line, _column, nil=_type, _data, _meta, acc, n, l, c, t, d, m) do
     lex(rest, file, params, binding, aliases, l, c, t, d, m, acc, n)
   end
+  def update_state(rest, file, params, binding, aliases, line, column, :colon=type, []=_data, meta, acc, n, l, c, t, d, m) do
+    lex(rest, file, params, binding, aliases, l, c, t, d, m, [node(type, line, column, acc, meta, file)], n)
+  end
   def update_state(rest, file, params, binding, aliases, line, column, :ident=type, data, meta, [{:as=tt, mm, []=aa}, {:ident, _, a}=right|acc]=ac, n, l, c, t, d, m) do
     case node(type, line, column, data, meta, file) do
       {:ident, _, as} = node -> lex(rest, file, params, binding, [{as, a}|aliases], l, c, t, d, m, [{tt, mm, [right, node|aa]}|acc], n)
       node -> lex(rest, file, params, binding, aliases, l, c, t, d, m, [node|ac], n)
     end
   end
-  def update_state(rest, file, params, binding, aliases, line, column, :ident=type, data, meta, [{:outer, _, []}=p, {tag, _, []}=p1, {:natural, _, []}=p2|acc], n, l, c, t, d, m) when tag in ~w[left right full]a do
-    {tt, mm, aa} = node(type, line, column, data, meta, file)
-    lex(rest, file, params, binding, aliases, l, c, t, d, m, [{tt, mm, [p2, p1, p|aa]} | acc], n)
-  end
-  def update_state(rest, file, params, binding, aliases, line, column, :ident=type, data, meta, [{:outer, _, []}=p, {tag, _, []}=p1|acc], n, l, c, t, d, m) when tag in ~w[left right full]a do
-    {tt, mm, aa} = node(type, line, column, data, meta, file)
-    lex(rest, file, params, binding, aliases, l, c, t, d, m, [{tt, mm, [p1, p|aa]} | acc], n)
-  end
-  def update_state(rest, file, params, binding, aliases, line, column, :ident=type, data, meta, [{:inner, _, []}=p, {:natural, _, []}=p1|acc], n, l, c, t, d, m) do
-    {tt, mm, aa} = node(type, line, column, data, meta, file)
-    lex(rest, file, params, binding, aliases, l, c, t, d, m, [{tt, mm, [p1, p|aa]} | acc], n)
-  end
-  def update_state(rest, file, params, binding, aliases, line, column, :ident=type, data, meta, [{tag, _, []}=p|acc], n, l, c, t, d, m) when tag in ~w[inner left right full natural cross]a do
-    case node(type, line, column, data, meta, file) do
-      {:join=tt, mm, aa} -> lex(rest, file, params, binding, aliases, l, c, t, d, m, [{tt, mm, [p|aa]}|acc], n)
-      node -> lex(rest, file, params, binding, aliases, l, c, t, d, m, [node, p|acc], n)
-    end
-  end
   def update_state(rest, file, params, binding, aliases, line, column, type, data, meta, [{:dot=t2, m2, []=a}, {tag, _, _}=right|acc], n, l, c, t, d, m) when (type in ~w[ident double_quote bracket dot]a or data==[[], ?*]) and tag in ~w[ident double_quote bracket dot]a do
     lex(rest, file, params, binding, aliases, l, c, t, d, m, [{t2, m2, [right, node(type, line, column, data, meta, file)|a]}|acc], n)
   end

lib/mix/tasks/sql.gen.test.ex

@@ -28,7 +28,6 @@ defmodule Mix.Tasks.Sql.Gen.Test do
     |> String.replace(~r{\(\s+'}, &String.replace(&1, " ", ""))
     |> String.replace(~r{\(\s+"}, &String.replace(&1, " ", ""))
     |> String.replace(~r{\(\s+\*}, &String.replace(&1, " ", ""))
-    |> String.replace(~r{[[:alpha:]]+\s+\(}, &String.replace(&1, " ", ""))
     |> String.replace(~r{\b\s+\,}, &String.replace(&1, " ", ""))
     |> String.replace(~r{\)\s+\,}, &String.replace(&1, " ", ""))
     |> String.replace(~r{\'\s+\,}, &String.replace(&1, " ", ""))