diff options
author | Yves Senn <yves.senn@gmail.com> | 2013-11-09 12:09:06 -0800 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2013-11-09 12:09:06 -0800 |
commit | 951348aec5dc5ec7443b8113ec7af4db5cde024c (patch) | |
tree | 6c5c8bb2bad46864546185c4c4fa87f063404a73 /activerecord | |
parent | 849400c36d8d03ad7d8b6d60afb247c293d292b4 (diff) | |
parent | 539ce8b68368698315475dcf20d35ad2fdd0f133 (diff) | |
download | rails-951348aec5dc5ec7443b8113ec7af4db5cde024c.tar.gz rails-951348aec5dc5ec7443b8113ec7af4db5cde024c.tar.bz2 rails-951348aec5dc5ec7443b8113ec7af4db5cde024c.zip |
Merge pull request #12821 from arunagw/aa-removed-missleading-message
clarified missleading message
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/core.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/invalid_connection_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index d93c26c130..96b5686ae0 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -109,7 +109,7 @@ module ActiveRecord elsif abstract_class? "#{super}(abstract)" elsif !connected? - "#{super}(no database connection)" + "#{super} (call '#{super}.connection' to establish a connection)" elsif table_exists? attr_list = columns.map { |c| "#{c.name}: #{c.type}" } * ', ' "#{super}(#{attr_list})" diff --git a/activerecord/test/cases/invalid_connection_test.rb b/activerecord/test/cases/invalid_connection_test.rb index f2d8f18ec7..f6774d7ef4 100644 --- a/activerecord/test/cases/invalid_connection_test.rb +++ b/activerecord/test/cases/invalid_connection_test.rb @@ -17,6 +17,6 @@ class TestAdapterWithInvalidConnection < ActiveRecord::TestCase end test "inspect on Model class does not raise" do - assert_equal "#{Bird.name}(no database connection)", Bird.inspect + assert_equal "#{Bird.name} (call '#{Bird.name}.connection' to establish a connection)", Bird.inspect end end |