Merge branch 'master' into collector

* master:
  remove order_clauses since we do not use it
  fix whitespace and unsupported method args
  Add Regexp and NotRegexp nodes for PostgreSQL
  Revert "Merge pull request #253 from corrupt952/master"
  flatten object.children in visit_Arel_Node_And
  Added right and full outer joins

Conflicts:
	lib/arel/visitors/to_sql.rb
	lib/arel/visitors/visitor.rb

1 files changed, 12 insertions, 0 deletions

diff --git a/test/visitors/test_depth_first.rb b/test/visitors/test_depth_first.rb
index cbaa780dae..baa8f64184 100644
--- a/test/visitors/test_depth_first.rb
+++ b/test/visitors/test_depth_first.rb
@@ -81,12 +81,24 @@ module Arel
         assert_equal [:a, :b, join], @collector.calls
       end
 
+      def test_full_outer_join
+        join = Nodes::FullOuterJoin.new :a, :b
+        @visitor.accept join
+        assert_equal [:a, :b, join], @collector.calls
+      end
+
       def test_outer_join
         join = Nodes::OuterJoin.new :a, :b
         @visitor.accept join
         assert_equal [:a, :b, join], @collector.calls
       end
 
+      def test_right_outer_join
+        join = Nodes::RightOuterJoin.new :a, :b
+        @visitor.accept join
+        assert_equal [:a, :b, join], @collector.calls
+      end
+
       [
         Arel::Nodes::Assignment,
         Arel::Nodes::Between,