improve formatting

Author: Schultzer

README.md

@@ -61,7 +61,7 @@ iex(6)> inspect(sql)
   [%User{id: 1, email: "john@example.com"}, %User{id: 2, email: "jane@example.com"}]
 ```
 
-## Compile time errors
+## Compile time warning
 run `mix sql.get` to generate your `sql.lock` file which is used for error reporting.
 
 ```elixir

lib/format.ex

@@ -19,8 +19,10 @@ defmodule SQL.Format do
 
   defp indention(acc, [{_, {_,_,_,_,_,0}}|_], _), do: acc
   defp indention(acc, [{_, {_,_,_,_,_,0,_,_}}|_], _), do: acc
+  defp indention(acc, [{_, {_,_,_,_,_,_}}|_], 0), do: [?\s|acc]
+  defp indention(acc, [{_, {_,_,_,_,_,_,_,_}}|_], 0), do: [?\s|acc]
   defp indention(acc, 0, 0), do: acc
-  defp indention(acc, _, 0), do: [?\s|acc]
+  defp indention(acc, _, 0), do: acc
   defp indention(acc, _, 1), do: [?\s,?\s|acc]
   defp indention(acc, m, indent), do: indention([?\s,?\s|acc], m, indent-1)
 
@@ -41,10 +43,10 @@ defmodule SQL.Format do
   end
   for atom <- newline do
     defp to_iodata({unquote(atom), _m, values}, binding, :lower=case, errors, indent, acc) do
-      newline([@keyword, unquote("#{atom}"), @reset|newline(to_iodata(values, binding, case, errors, indent, acc), indent)], indent)
+      newline([@keyword, unquote("#{atom}"), @reset|pad(to_iodata(values, binding, case, errors, indent+1, acc))], indent)
     end
     defp to_iodata({unquote(atom), _m, values}, binding, :upper=case, errors, indent, acc) do
-      newline([@keyword, unquote(String.upcase("#{atom}")), @reset|newline(to_iodata(values, binding, case, errors, indent, acc), indent)], indent)
+      newline([@keyword, unquote(String.upcase("#{atom}")), @reset|pad(to_iodata(values, binding, case, errors, indent+1, acc))], indent)
     end
   end
   for atom <- ~w[group order]a do
@@ -61,8 +63,8 @@ defmodule SQL.Format do
   defp to_iodata(:comma, _binding, _case, _errors, 0, acc) do
     [?,|acc]
   end
-  defp to_iodata(:comma, _binding, _case, _errors, indent, acc) do
-    [?,|newline(acc, indent)]
+  defp to_iodata(:comma, _binding, _case, _errors, _indent, acc) do
+    [?,|pad(acc)]
   end
   defp to_iodata(:dot, _binding, _case, _errors, _indent, acc) do
     [?.|acc]

test/formatter_test.exs

@@ -9,6 +9,6 @@ defmodule SQL.FormatterTest do
   end
 
   test "format/2 preserve interpolation" do
-    assert "\n\e[35mwith\e[0m \e[35mrecursive\e[0m \e[33mtemp\e[0m(\e[33mn\e[0m, \e[33mfact\e[0m) \e[35mas\e[0m (\n  \e[35mselect\e[0m\n    \e[33m0\e[0m,\n    \e[33m1\e[0m\n  \e[35munion\e[0m \e[35mall\e[0m\n  \e[35mselect\e[0m\n    \e[33mn\e[0m \e[35m+\e[0m {{one}},\n    (\e[33mn\e[0m \e[35m+\e[0m {{one}}) \e[35m*\e[0m \e[33mfact\e[0m\n  \e[35mfrom\e[0m\n    \e[33mtemp\e[0m\n  \e[35mwhere\e[0m\n    \e[33mn\e[0m \e[35m<\e[0m \e[33m9\e[0m\n)" == SQL.MixFormatter.format("with recursive temp(n, fact) as (select 0, 1 union all select n + {{one}}, (n + {{one}}) * fact from temp where n < 9)", [])
+    assert "\n\e[35mwith\e[0m \e[35mrecursive\e[0m \e[33mtemp\e[0m(\e[33mn\e[0m, \e[33mfact\e[0m) \e[35mas\e[0m(\n  \e[35mselect\e[0m\n    \e[33m0\e[0m,\n    \e[33m1\e[0m\n  \e[35munion\e[0m \e[35mall\e[0m\n  \e[35mselect\e[0m\n    \e[33mn\e[0m \e[35m+\e[0m {{one}},\n    (\e[33mn\e[0m \e[35m+\e[0m {{one}}) \e[35m*\e[0m \e[33mfact\e[0m\n  \e[35mfrom\e[0m\n    \e[33mtemp\e[0m\n  \e[35mwhere\e[0m\n    \e[33mn\e[0m \e[35m<\e[0m \e[33m9\e[0m\n)" == SQL.MixFormatter.format("with recursive temp(n, fact) as (select 0, 1 union all select n + {{one}}, (n + {{one}}) * fact from temp where n < 9)", [])
   end
 end

test/sql_test.exs

@@ -47,7 +47,7 @@ defmodule SQLTest do
 
 
   test "inspect/1" do
-    assert ~s(\e[0m~SQL\"\"\"\n\e[35mselect\e[0m\n \e[35m+\e[0m\e[33m1000\e[0m\n\"\"\") == inspect(~SQL[select +1000])
+    assert ~s(\e[0m~SQL\"\"\"\n\e[35mselect\e[0m\n  \e[35m+\e[0m\e[33m1000\e[0m\n\"\"\") == inspect(~SQL[select +1000])
   end
 
   test "to_sql/1" do