Merge remote branch 'ernie/master'

* ernie/master:
  Make PostgreSQL play nice with its friends. (matches -> ILIKE instead of LIKE)
  Add support for remaining *_any/*_all attribute methods, and add matches/does_not_match/not_in
  Add eq_any.

2 files changed, 22 insertions, 0 deletions

diff --git a/lib/arel/visitors/postgresql.rb b/lib/arel/visitors/postgresql.rb
index 87fc3bd60d..5e03f40984 100644
--- a/lib/arel/visitors/postgresql.rb
+++ b/lib/arel/visitors/postgresql.rb
@@ -21,6 +21,14 @@ module Arel
         end
       end
 
+      def visit_Arel_Nodes_Matches o
+        "#{visit o.left} ILIKE #{visit o.right}"
+      end
+
+      def visit_Arel_Nodes_DoesNotMatch o
+        "#{visit o.left} NOT ILIKE #{visit o.right}"
+      end
+
       def using_distinct_on?(o)
         o.cores.any? do |core|
           core.projections.any? do |projection|
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index fc821a0ddb..7f9186d28c 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -161,6 +161,14 @@ module Arel
         "#{visit o.left} < #{visit o.right}"
       end
 
+      def visit_Arel_Nodes_Matches o
+        "#{visit o.left} LIKE #{visit o.right}"
+      end
+
+      def visit_Arel_Nodes_DoesNotMatch o
+        "#{visit o.left} NOT LIKE #{visit o.right}"
+      end
+
       def visit_Arel_Nodes_StringJoin o
         "#{visit o.left} #{visit o.right}"
       end
@@ -191,6 +199,12 @@ module Arel
         "#{visit o.left} IN (#{right})"
       end
 
+      def visit_Arel_Nodes_NotIn o
+        right = o.right
+        right = right.empty? ? 'NULL' : right.map { |x| visit x }.join(', ')
+        "#{visit o.left} NOT IN (#{right})"
+      end
+
       def visit_Arel_Nodes_And o
         "#{visit o.left} AND #{visit o.right}"
       end