Skip to content

Commit

Permalink
Merge pull request #12821 from arunagw/aa-removed-missleading-message
Browse files Browse the repository at this point in the history
clarified missleading message
  • Loading branch information
senny committed Nov 9, 2013
2 parents 849400c + 539ce8b commit 951348a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/core.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def inspect
elsif abstract_class? elsif abstract_class?
"#{super}(abstract)" "#{super}(abstract)"
elsif !connected? elsif !connected?
"#{super}(no database connection)" "#{super} (call '#{super}.connection' to establish a connection)"
elsif table_exists? elsif table_exists?
attr_list = columns.map { |c| "#{c.name}: #{c.type}" } * ', ' attr_list = columns.map { |c| "#{c.name}: #{c.type}" } * ', '
"#{super}(#{attr_list})" "#{super}(#{attr_list})"
Expand Down
2 changes: 1 addition & 1 deletion activerecord/test/cases/invalid_connection_test.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ def teardown
end end


test "inspect on Model class does not raise" do 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
end end

0 comments on commit 951348a

Please sign in to comment.