diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-07-07 10:07:28 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-07-07 10:07:28 +0100 |
| commit | c433adffa23785d3727379902859f57bc3f68b27 (patch) | |
| tree | c83cff08a7ede470cfaad49cf9f8b9ee6e2c1319 /activerecord/lib/active_record | |
| parent | b76b9e216463f045c8a5ca4b1a6a7994f2baa389 (diff) | |
| download | rails-c433adffa23785d3727379902859f57bc3f68b27.tar.gz rails-c433adffa23785d3727379902859f57bc3f68b27.tar.bz2 rails-c433adffa23785d3727379902859f57bc3f68b27.zip | |
Relation#inspect handles doesn't perform a new query on an already-loaded relation
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 0d1c9ef3e5..a39328b89b 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -515,7 +515,10 @@ module ActiveRecord end def inspect - entries = limit([limit_value, 11].compact.min).map(&:inspect) + limit = [limit_value, 11].compact.min + entries = loaded? ? to_a.take(limit) : limit(limit) + + entries.map!(&:inspect) entries[10] = '...' if entries.size == 11 "#<#{self.class.name} [#{entries.join(', ')}]>" |