From 24d598fad1a80c3ec1875588be577a37f9e4f9f9 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 14 Dec 2010 11:04:08 -0800 Subject: string join should be a unary op --- test/test_select_manager.rb | 2 +- test/visitors/test_depth_first.rb | 5 +++-- test/visitors/test_join_sql.rb | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb index 761ebdaee3..15153d3523 100644 --- a/test/test_select_manager.rb +++ b/test/test_select_manager.rb @@ -367,7 +367,7 @@ module Arel it 'returns string join sql' do table = Table.new :users manager = Arel::SelectManager.new Table.engine - manager.from Nodes::StringJoin.new(table, 'hello') + manager.from Nodes::StringJoin.new('hello') manager.join_sql.must_be_like %{ 'hello' } end diff --git a/test/visitors/test_depth_first.rb b/test/visitors/test_depth_first.rb index 34931c783e..4bce468183 100644 --- a/test/visitors/test_depth_first.rb +++ b/test/visitors/test_depth_first.rb @@ -29,6 +29,7 @@ module Arel Arel::Nodes::Grouping, Arel::Nodes::Offset, Arel::Nodes::Having, + Arel::Nodes::StringJoin, Arel::Nodes::UnqualifiedColumn, ].each do |klass| define_method("test_#{klass.name.gsub('::', '_')}") do @@ -91,7 +92,6 @@ module Arel Arel::Nodes::NotEqual, Arel::Nodes::NotIn, Arel::Nodes::Or, - Arel::Nodes::StringJoin, Arel::Nodes::TableAlias, Arel::Nodes::Values, Arel::Nodes::As, @@ -176,7 +176,8 @@ module Arel @visitor.accept core assert_equal [ :a, core.projections, - :b, + :b, [], + core.source, :c, core.wheres, :d, core.groups, :e, diff --git a/test/visitors/test_join_sql.rb b/test/visitors/test_join_sql.rb index b0eba172e6..b672f88ecf 100644 --- a/test/visitors/test_join_sql.rb +++ b/test/visitors/test_join_sql.rb @@ -8,6 +8,11 @@ module Arel @visitor.extend(JoinSql) end + it 'should visit string join' do + sql = @visitor.accept Nodes::StringJoin.new('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 -- cgit v1.2.3