diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-11-07 09:00:28 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-11-07 09:03:25 +0100 |
| commit | 888ea6bf4452971bdb32a92e854116c8cd053497 (patch) | |
| tree | 7f9298266904c874b63cbebc8dbf6c04d8827ec5 | |
| parent | 9a517b5a0b97b8872af1e66b2a5e3fd765f0d0a1 (diff) | |
| parent | d424ded6fd4b923802e9dab62b463a6f3439417f (diff) | |
| download | rails-888ea6bf4452971bdb32a92e854116c8cd053497.tar.gz rails-888ea6bf4452971bdb32a92e854116c8cd053497.tar.bz2 rails-888ea6bf4452971bdb32a92e854116c8cd053497.zip | |
Merge pull request #17541 from OpenSourceProjects/meaninful_message
Print out a meaningful error when ActiveRecord::ReadOnlyRecord is raised
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/persistence.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/readonly_test.rb | 12 |
3 files changed, 15 insertions, 5 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 6bb1ea3cec..c4b74c6477 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* `ActiveRecord::ReadOnlyRecord` now has a descriptive message. + + *Franky W.* + * Fix preloading of associations which unscope a default scope. Fixes #11036. diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index 9d2c9d3b9c..06c8bceb30 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -188,7 +188,7 @@ module ActiveRecord # and <tt>destroy</tt> returns +false+. See # ActiveRecord::Callbacks for further details. def destroy - raise ReadOnlyRecord if readonly? + raise ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly? destroy_associations destroy_row if persisted? @destroyed = true @@ -519,7 +519,7 @@ module ActiveRecord end def create_or_update - raise ReadOnlyRecord if readonly? + raise ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly? result = new_record? ? _create_record : _update_record result != false end diff --git a/activerecord/test/cases/readonly_test.rb b/activerecord/test/cases/readonly_test.rb index 2afd25c989..5b903e4f2c 100644 --- a/activerecord/test/cases/readonly_test.rb +++ b/activerecord/test/cases/readonly_test.rb @@ -22,9 +22,15 @@ class ReadOnlyTest < ActiveRecord::TestCase assert !dev.save dev.name = 'Forbidden.' end - assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save } - assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save! } - assert_raise(ActiveRecord::ReadOnlyRecord) { dev.destroy } + + e = assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save } + assert_equal "Developer is marked as readonly", e.message + + e = assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save! } + assert_equal "Developer is marked as readonly", e.message + + e = assert_raise(ActiveRecord::ReadOnlyRecord) { dev.destroy } + assert_equal "Developer is marked as readonly", e.message end |