From 7515445966b265dd9e90ce4457bff972e1fc3746 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 7 Apr 2014 10:04:40 -0700 Subject: Revert "Merge pull request #253 from corrupt952/master" This reverts commit 6d3ed6d96c4a3ac85b97d81bad95b7254b2aa2d4, reversing changes made to a35fede61ac1a2fcff519ad052f2fcb8808922b9. --- lib/arel/visitors/to_sql.rb | 2 +- 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 2d81022a7a..84a88e1899 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.flatten.map { |x| visit x}.join ' AND ' + o.children.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 0a7af91397..b142ecd695 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), @attr.eq(12)]] + node = Nodes::And.new [@attr.eq(10), @attr.eq(11)] @visitor.accept(node).must_be_like %{ - "users"."id" = 10 AND "users"."id" = 11 AND "users"."id" = 12 + "users"."id" = 10 AND "users"."id" = 11 } end -- cgit v1.2.3