diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-10-20 19:02:32 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-11-19 19:08:57 -0300 |
| commit | b9e869a420d0ae0a94446df012c215aefa58487b (patch) | |
| tree | 0a534b92d38dc9d10749ee2bc55ec4e37ec5e89b | |
| parent | 024bc70bfe2aa9584ecd67246d85787901362c4e (diff) | |
| download | rails-b9e869a420d0ae0a94446df012c215aefa58487b.tar.gz rails-b9e869a420d0ae0a94446df012c215aefa58487b.tar.bz2 rails-b9e869a420d0ae0a94446df012c215aefa58487b.zip | |
Query objects if readonly_value is false, skip them only if nil.
| -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 |