attributes do not need a column member

2 files changed, 9 insertions, 4 deletions

diff --git a/test/visitors/test_join_sql.rb b/test/visitors/test_join_sql.rb
index 8253fe5ab4..181ef6c570 100644
--- a/test/visitors/test_join_sql.rb
+++ b/test/visitors/test_join_sql.rb
@@ -4,7 +4,8 @@ module Arel
   module Visitors
     describe 'the join_sql visitor' do
       before do
-        @visitor = JoinSql.new Table.engine
+        @visitor = ToSql.new Table.engine
+        @visitor.extend(JoinSql)
       end
 
       describe 'inner join' do
diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb
index 1c5c8eac0c..04d5e2d39f 100644
--- a/test/visitors/test_to_sql.rb
+++ b/test/visitors/test_to_sql.rb
@@ -84,7 +84,7 @@ module Arel
       end
 
       it "should visit visit_Arel_Attributes_Time" do
-        attr = Attributes::Time.new(@attr.relation, @attr.name, @attr.column)
+        attr = Attributes::Time.new(@attr.relation, @attr.name)
         @visitor.accept attr
       end
 
@@ -143,7 +143,9 @@ module Arel
           end
           in_node = Nodes::In.new @attr, %w{ a b c }
           visitor = visitor.new(Table.engine)
-          visitor.expected = @attr.column
+          visitor.expected = Table.engine.connection.columns(:users).find { |x|
+            x.name == 'name'
+          }
           visitor.accept(in_node).must_equal %("users"."name" IN ('a', 'b', 'c'))
         end
       end
@@ -189,7 +191,9 @@ module Arel
           end
           in_node = Nodes::NotIn.new @attr, %w{ a b c }
           visitor = visitor.new(Table.engine)
-          visitor.expected = @attr.column
+          visitor.expected = Table.engine.connection.columns(:users).find { |x|
+            x.name == 'name'
+          }
           visitor.accept(in_node).must_equal %("users"."name" NOT IN ('a', 'b', 'c'))
         end
       end