aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Cardarella <bcardarella@gmail.com>2012-06-26 14:33:21 -0400
committerBrian Cardarella <bcardarella@gmail.com>2012-06-29 14:58:19 -0500
commit05c7e0ae6425fc5cbc9cb50bd035a3ee80e8b4b3 (patch)
tree69263050f7a52ef98d71d277ec325765258f2fb0
parent58c83d4c6108a67ee0cf2de4ed8ea91953f98d2d (diff)
downloadrails-05c7e0ae6425fc5cbc9cb50bd035a3ee80e8b4b3.tar.gz
rails-05c7e0ae6425fc5cbc9cb50bd035a3ee80e8b4b3.tar.bz2
rails-05c7e0ae6425fc5cbc9cb50bd035a3ee80e8b4b3.zip
Remove ActiveRelation#inspect
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/relation.rb4
-rw-r--r--activerecord/test/cases/associations/has_many_associations_test.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 7a3dfd34dc..aeb3773c99 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* `ActiveRelation#inspect` no longer calls `#to_a`
+
+ *Brian Cardarella*
+
* Add `collate` and `ctype` support to PostgreSQL. These are available for PostgreSQL 8.4 or later.
Example:
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index fe3aa00a74..e268d451e0 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -492,10 +492,6 @@ module ActiveRecord
end
end
- def inspect
- to_a.inspect
- end
-
def pretty_print(q)
q.pp(self.to_a)
end
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index b8481175b2..3ea6201d60 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -193,7 +193,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
def test_no_sql_should_be_fired_if_association_already_loaded
Car.create(:name => 'honda')
bulbs = Car.first.bulbs
- bulbs.inspect # to load all instances of bulbs
+ bulbs.to_a # to load all instances of bulbs
assert_no_queries do
bulbs.first()