aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/visitors
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-04-07 10:04:40 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-04-07 10:04:40 -0700
commit7515445966b265dd9e90ce4457bff972e1fc3746 (patch)
tree3cfb5968941e8979ebdfe12c2884398b65f7c8b6 /lib/arel/visitors
parent6d3ed6d96c4a3ac85b97d81bad95b7254b2aa2d4 (diff)
downloadrails-7515445966b265dd9e90ce4457bff972e1fc3746.tar.gz
rails-7515445966b265dd9e90ce4457bff972e1fc3746.tar.bz2
rails-7515445966b265dd9e90ce4457bff972e1fc3746.zip
Revert "Merge pull request #253 from corrupt952/master"
This reverts commit 6d3ed6d96c4a3ac85b97d81bad95b7254b2aa2d4, reversing changes made to a35fede61ac1a2fcff519ad052f2fcb8808922b9.
Diffstat (limited to 'lib/arel/visitors')
-rw-r--r--lib/arel/visitors/to_sql.rb2
1 files changed, 1 insertions, 1 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