diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-04 11:36:15 -0500 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-04 11:36:15 -0500 |
commit | 6d3ed6d96c4a3ac85b97d81bad95b7254b2aa2d4 (patch) | |
tree | 7500812a9448416ebcf4d45917de249b9f6248a3 | |
parent | a35fede61ac1a2fcff519ad052f2fcb8808922b9 (diff) | |
parent | 8e3e04f47dd356ec6a0adba32a440ce388767faa (diff) | |
download | rails-6d3ed6d96c4a3ac85b97d81bad95b7254b2aa2d4.tar.gz rails-6d3ed6d96c4a3ac85b97d81bad95b7254b2aa2d4.tar.bz2 rails-6d3ed6d96c4a3ac85b97d81bad95b7254b2aa2d4.zip |
Merge pull request #253 from corrupt952/master
small changes visit_Arel_Node_And
-rw-r--r-- | lib/arel/visitors/to_sql.rb | 2 | ||||
-rw-r--r-- | test/visitors/test_to_sql.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index 84a88e1899..2d81022a7a 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -500,7 +500,7 @@ module Arel end def visit_Arel_Nodes_And o - o.children.map { |x| visit x}.join ' AND ' + o.children.flatten.map { |x| visit x}.join ' AND ' end def visit_Arel_Nodes_Or o diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb index b142ecd695..0a7af91397 100644 --- a/test/visitors/test_to_sql.rb +++ b/test/visitors/test_to_sql.rb @@ -237,9 +237,9 @@ module Arel end it "should visit_Arel_Nodes_And" do - node = Nodes::And.new [@attr.eq(10), @attr.eq(11)] + node = Nodes::And.new [@attr.eq(10), [@attr.eq(11), @attr.eq(12)]] @visitor.accept(node).must_be_like %{ - "users"."id" = 10 AND "users"."id" = 11 + "users"."id" = 10 AND "users"."id" = 11 AND "users"."id" = 12 } end |