diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2013-06-20 22:47:23 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2013-06-20 22:47:23 -0700 |
| commit | 5ac22989d3f18bd3bf1011ca5ffd0a045e394d2c (patch) | |
| tree | 8fb3c5251eb47916fbc3d72e13395d79945875be /activerecord/lib | |
| parent | 3c0ef057f1af4d39379ba572139aa104c3673779 (diff) | |
| parent | 0f3aadae3b639ce56dba9c1bcf8a3c3646ccc93b (diff) | |
| download | rails-5ac22989d3f18bd3bf1011ca5ffd0a045e394d2c.tar.gz rails-5ac22989d3f18bd3bf1011ca5ffd0a045e394d2c.tar.bz2 rails-5ac22989d3f18bd3bf1011ca5ffd0a045e394d2c.zip | |
Merge pull request #11014 from senny/10936_inspect_does_not_crash_without_connection
`inspect` for AR model classes does not initiate a new connection.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index ba053700f2..f0141aaaab 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -123,6 +123,8 @@ module ActiveRecord super elsif abstract_class? "#{super}(abstract)" + elsif !connected? + "#{super}(no database connection)" elsif table_exists? attr_list = columns.map { |c| "#{c.name}: #{c.type}" } * ', ' "#{super}(#{attr_list})" |