aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-04-08 21:38:19 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-04-08 21:38:19 -0700
commit5d403e45858956e89d323e44ab7b413f80f5171f (patch)
tree305bca63fec46189fb8ef876cad2f5bb4b53bb8c
parentbf791073972a179e6d79c8e2f89536734e315f54 (diff)
downloadrails-5d403e45858956e89d323e44ab7b413f80f5171f.tar.gz
rails-5d403e45858956e89d323e44ab7b413f80f5171f.tar.bz2
rails-5d403e45858956e89d323e44ab7b413f80f5171f.zip
fixing BINARY tests
-rw-r--r--lib/arel/visitors/mysql.rb5
-rw-r--r--lib/arel/visitors/to_sql.rb4
-rw-r--r--test/nodes/test_bin.rb4
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/arel/visitors/mysql.rb b/lib/arel/visitors/mysql.rb
index cf590598e1..92348ca7e3 100644
--- a/lib/arel/visitors/mysql.rb
+++ b/lib/arel/visitors/mysql.rb
@@ -30,8 +30,9 @@ module Arel
end
end
- def visit_Arel_Nodes_Bin o
- "BINARY #{visit o.expr}"
+ def visit_Arel_Nodes_Bin o, collector
+ collector << "BINARY "
+ visit o.expr, collector
end
###
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 9ec926a66e..cba289c35c 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -274,8 +274,8 @@ module Arel
collector
end
- def visit_Arel_Nodes_Bin o
- visit o.expr
+ def visit_Arel_Nodes_Bin o, collector
+ visit o.expr, collector
end
def visit_Arel_Nodes_Distinct o, collector
diff --git a/test/nodes/test_bin.rb b/test/nodes/test_bin.rb
index 1d955b218b..0dcc5f7bb8 100644
--- a/test/nodes/test_bin.rb
+++ b/test/nodes/test_bin.rb
@@ -10,13 +10,13 @@ module Arel
def test_default_to_sql
viz = Arel::Visitors::ToSql.new Table.engine.connection_pool
node = Arel::Nodes::Bin.new(Arel.sql('zomg'))
- assert_equal 'zomg', viz.accept(node)
+ assert_equal 'zomg', viz.accept(node, Collectors::SQLString.new).value
end
def test_mysql_to_sql
viz = Arel::Visitors::MySQL.new Table.engine.connection_pool
node = Arel::Nodes::Bin.new(Arel.sql('zomg'))
- assert_equal 'BINARY zomg', viz.accept(node)
+ assert_equal 'BINARY zomg', viz.accept(node, Collectors::SQLString.new).value
end
def test_equality_with_same_ivars