Merge branch 'master' into collector

* master:
  removing unused join_sql method

1 files changed, 0 insertions, 68 deletions

diff --git a/test/visitors/test_join_sql.rb b/test/visitors/test_join_sql.rb
deleted file mode 100644
index 34378dafe7..0000000000
--- a/test/visitors/test_join_sql.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require 'helper'
-
-module Arel
-  module Visitors
-    describe 'the join_sql visitor' do
-      before do
-        @visitor = ToSql.new Table.engine.connection
-        @visitor.extend(JoinSql)
-      end
-
-      it 'should visit string join' do
-        sql = @visitor.accept Nodes::StringJoin.new(Nodes.build_quoted('omg'))
-        sql.must_be_like "'omg'"
-      end
-
-      describe 'inner join' do
-        it 'should visit left if left is a join' do
-          t    = Table.new :users
-          sm   = t.select_manager
-          sm.join(t).on(t[:id]).join(t).on(t[:id])
-          sm.join_sql.must_be_like %{
-            INNER JOIN "users" ON "users"."id"
-            INNER JOIN "users" ON "users"."id"
-          }
-        end
-      end
-
-      describe 'FULL outer join' do
-        it 'should visit left if left is a join' do
-          t    = Table.new :users
-          sm   = t.select_manager
-          sm.join(t, Nodes::FullOuterJoin).on(t[:id]).join(
-            t, Nodes::FullOuterJoin).on(t[:id])
-          sm.join_sql.must_be_like %{
-            FULL OUTER JOIN "users" ON "users"."id"
-            FULL OUTER JOIN "users" ON "users"."id"
-          }
-        end
-      end
-
-      describe 'outer join' do
-        it 'should visit left if left is a join' do
-          t    = Table.new :users
-          sm   = t.select_manager
-          sm.join(t, Nodes::OuterJoin).on(t[:id]).join(
-            t, Nodes::OuterJoin).on(t[:id])
-          sm.join_sql.must_be_like %{
-            LEFT OUTER JOIN "users" ON "users"."id"
-            LEFT OUTER JOIN "users" ON "users"."id"
-          }
-        end
-      end
-
-      describe 'right outer join' do
-        it 'should visit left if left is a join' do
-          t    = Table.new :users
-          sm   = t.select_manager
-          sm.join(t, Nodes::RightOuterJoin).on(t[:id]).join(
-            t, Nodes::RightOuterJoin).on(t[:id])
-          sm.join_sql.must_be_like %{
-            RIGHT OUTER JOIN "users" ON "users"."id"
-            RIGHT OUTER JOIN "users" ON "users"."id"
-          }
-        end
-      end
-    end
-  end
-end