Add Postgres GiST operators #17 (#18)

Author: ibarchenkov

lib/lexer.ex

@@ -134,15 +134,15 @@ defmodule SQL.Lexer do
     acc = if type, do: insert_node(node(ident(type, data), line, column, data, opts), acc), else: acc
     lex(rest, binary, opts, line, column, nil, [], insert_node(node(type(b), line, column+1, [], opts), acc), n)
   end
-  def lex(<<b::binary-size(3), rest::binary>>, binary, opts, line, column, type, data, acc, n) when b in ~w[^-= |*= <=>] do
+  def lex(<<b::binary-size(3), rest::binary>>, binary, opts, line, column, type, data, acc, n) when b in ~w[^-= |*= <=> <-> >>= &<| <<| |>> |&> -|-] do
     node = node(String.to_atom(b), line, column+3, [], opts)
     if data == [] do
       lex(rest, binary, opts, line, column+3, type, data, insert_node(node, acc), n)
     else
       lex(rest, binary, opts, line, column+3, nil, [], insert_node(node, insert_node(node(ident(type, data), line, column, data, opts), acc)), n)
     end
   end
-  def lex(<<b::binary-size(2), rest::binary>>, binary, opts, line, column, type, data, acc, n) when b in ~w[:: <> != !< !> <= >= += -= *= /= %= &= ||] do
+  def lex(<<b::binary-size(2), rest::binary>>, binary, opts, line, column, type, data, acc, n) when b in ~w[:: <> != !< !> <= >= += -= *= /= %= &= || << &< && &> >> ~= @> <@ @@] do
     node = node(String.to_atom(b), line, column+2, [], opts)
     if data == [] do
       lex(rest, binary, opts, line, column+2, type, data, insert_node(node, acc), n)

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

@@ -414,15 +414,15 @@ defmodule Mix.Tasks.Sql.Gen.Parser do
       acc = if type, do: insert_node(node(ident(type, data), line, column, data, opts), acc), else: acc
       lex(rest, binary, opts, line, column, nil, [], insert_node(node(type(b), line, column+1, [], opts), acc), n)
     end
-    def lex(<<b::binary-size(3), rest::binary>>, binary, opts, line, column, type, data, acc, n) when b in ~w[^-= |*= <=>] do
+    def lex(<<b::binary-size(3), rest::binary>>, binary, opts, line, column, type, data, acc, n) when b in ~w[^-= |*= <=> <-> >>= &<| <<| |>> |&> -|-] do
       node = node(String.to_atom(b), line, column+3, [], opts)
       if data == [] do
         lex(rest, binary, opts, line, column+3, type, data, insert_node(node, acc), n)
       else
         lex(rest, binary, opts, line, column+3, nil, [], insert_node(node, insert_node(node(ident(type, data), line, column, data, opts), acc)), n)
       end
     end
-    def lex(<<b::binary-size(2), rest::binary>>, binary, opts, line, column, type, data, acc, n) when b in ~w[:: <> != !< !> <= >= += -= *= /= %= &= ||] do
+    def lex(<<b::binary-size(2), rest::binary>>, binary, opts, line, column, type, data, acc, n) when b in ~w[:: <> != !< !> <= >= += -= *= /= %= &= || << &< && &> >> ~= @> <@ @@] do
       node = node(String.to_atom(b), line, column+2, [], opts)
       if data == [] do
         lex(rest, binary, opts, line, column+2, type, data, insert_node(node, acc), n)

test/adapters/postgres_test.exs

@@ -263,6 +263,54 @@ defmodule SQL.Adapters.PostgresTest do
       assert "where id <= 1" == to_string(~SQL[where id <= 1])
       assert "where id <= 1" == to_string(~SQL[where id<=1])
     end
+    test "<<" do
+      assert "where id << 1" == to_string(~SQL[where id << 1])
+    end
+    test "&<" do
+      assert "where id &< 1" == to_string(~SQL[where id &< 1])
+    end
+    test "&&" do
+      assert "where id && 1" == to_string(~SQL[where id && 1])
+    end
+    test "&>" do
+      assert "where id &> 1" == to_string(~SQL[where id &> 1])
+    end
+    test ">>" do
+      assert "where id >> 1" == to_string(~SQL[where id >> 1])
+    end
+    test "~=" do
+      assert "where id ~= 1" == to_string(~SQL[where id ~= 1])
+    end
+    test "@>" do
+      assert "where id @> 1" == to_string(~SQL[where id @> 1])
+    end
+    test "<@" do
+      assert "where id <@ 1" == to_string(~SQL[where id <@ 1])
+    end
+    test "&<|" do
+      assert "where id &<| 1" == to_string(~SQL[where id &<| 1])
+    end
+    test "<<|" do
+      assert "where id <<| 1" == to_string(~SQL[where id <<| 1])
+    end
+    test "|>>" do
+      assert "where id |>> 1" == to_string(~SQL[where id |>> 1])
+    end
+    test "|&>" do
+      assert "where id |&> 1" == to_string(~SQL[where id |&> 1])
+    end
+    test "@@" do
+      assert "where id @@ 1" == to_string(~SQL[where id @@ 1])
+    end
+    test "<->" do
+      assert "where id <-> 1" == to_string(~SQL[where id <-> 1])
+    end
+    test ">>=" do
+      assert "where id <-> 1" == to_string(~SQL[where id <-> 1])
+    end
+    test "-|-" do
+      assert "where id -|- 1" == to_string(~SQL[where id -|- 1])
+    end
     test "between" do
       assert "where id between 1 and 2" == to_string(~SQL[where id between 1 and 2])
       assert "where id not between 1 and 2" == to_string(~SQL[where id not between 1 and 2])