From 26915a18b197d6b062efbc7c89dc9555f29841ed Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 24 Feb 2015 13:40:18 -0700 Subject: Fix c479480638508c20601af69ca46b5b606c2d5b4d to account for from_value -> from_clause in bdc5141652770fd227455681cde1f9899f55b0b9 --- activerecord/lib/active_record/relation/query_methods.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record') 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| -- cgit v1.2.3