aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-09-11 19:18:43 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-09-11 19:18:43 +0900
commitb05d39f3b9cc0c1a698ccd426175d72f706945ee (patch)
tree6df8a1db47d2bb86f166085fc64ca4801345383d /activerecord
parent7e167d0ceeef42f8c14328985e16adb59a698ebd (diff)
downloadrails-b05d39f3b9cc0c1a698ccd426175d72f706945ee.tar.gz
rails-b05d39f3b9cc0c1a698ccd426175d72f706945ee.tar.bz2
rails-b05d39f3b9cc0c1a698ccd426175d72f706945ee.zip
Remove unused `existing` arg in `SelectManager#collapse`
The `existing` arg was added at 8bc0fce, but it is no longer used since aac9da2.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/arel/select_manager.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/arel/select_manager.rb b/activerecord/lib/arel/select_manager.rb
index 22a04b00c6..733176ad9e 100644
--- a/activerecord/lib/arel/select_manager.rb
+++ b/activerecord/lib/arel/select_manager.rb
@@ -252,9 +252,9 @@ module Arel # :nodoc: all
end
private
- def collapse(exprs, existing = nil)
- exprs = exprs.unshift(existing.expr) if existing
- exprs = exprs.compact.map { |expr|
+ def collapse(exprs)
+ exprs = exprs.compact
+ exprs.map! { |expr|
if String === expr
# FIXME: Don't do this automatically
Arel.sql(expr)