diff options
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 500506506a..4ea0c0f2b4 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -61,12 +61,12 @@ module ActiveRecord def to_a return @records if loaded? - @records = if @readonly_value + @records = if @readonly_value.nil? + eager_loading? ? find_with_associations : @klass.find_by_sql(arel.to_sql, @bind_values) + else IdentityMap.without do eager_loading? ? find_with_associations : @klass.find_by_sql(arel.to_sql, @bind_values) end - else - eager_loading? ? find_with_associations : @klass.find_by_sql(arel.to_sql, @bind_values) end preload = @preload_values |