diff options
| author | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-24 13:40:18 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremykemper@gmail.com> | 2015-02-24 13:40:18 -0700 |
| commit | 26915a18b197d6b062efbc7c89dc9555f29841ed (patch) | |
| tree | 781e9c2b4fbc8b4c7135a891fe60f92b1eed50a1 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | c479480638508c20601af69ca46b5b606c2d5b4d (diff) | |
| download | rails-26915a18b197d6b062efbc7c89dc9555f29841ed.tar.gz rails-26915a18b197d6b062efbc7c89dc9555f29841ed.tar.bz2 rails-26915a18b197d6b062efbc7c89dc9555f29841ed.zip | |
Fix c479480638508c20601af69ca46b5b606c2d5b4d to account for from_value -> from_clause in bdc5141652770fd227455681cde1f9899f55b0b9
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 43b013352b..69ce5cdc2a 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -999,7 +999,7 @@ module ActiveRecord end def arel_columns(columns) - if from_value + if from_clause.value columns else columns.map do |field| |