aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-03-29 12:59:47 -0400
committerGitHub <noreply@github.com>2017-03-29 12:59:47 -0400
commiteccc149be362ccf12446ed1c8287e011731a817b (patch)
tree5b25e44a6239f118c8df5aab99021c43659e6115 /activerecord/lib/active_record
parent098e94caf6515c92334b03af4c8358e39a4201a5 (diff)
parent3d6176fded424a2195e399d031e343bbcd0edcad (diff)
downloadrails-eccc149be362ccf12446ed1c8287e011731a817b.tar.gz
rails-eccc149be362ccf12446ed1c8287e011731a817b.tar.bz2
rails-eccc149be362ccf12446ed1c8287e011731a817b.zip
Merge pull request #28592 from htanata/ar_relation_inspect_should_not_load_all_records
Load only needed records on ActiveRecord::Relation#inspect
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/relation.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 2d6b21bec5..5775eda5a5 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -635,7 +635,9 @@ module ActiveRecord
end
def inspect
- entries = records.take([limit_value, 11].compact.min).map!(&:inspect)
+ subject = loaded? ? records : self
+ entries = subject.take([limit_value, 11].compact.min).map!(&:inspect)
+
entries[10] = "..." if entries.size == 11
"#<#{self.class.name} [#{entries.join(', ')}]>"