Don't destroy readonly models

drogus · May 17, 2012 · a8b370f · a8b370f
1 parent 85ac143
commit a8b370f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   It's not possible anymore to destroy a model marked as read only.
+
+    *Johannes Barre*
+
+
 *   Added ability to ActiveRecord::Relation#from to accept other ActiveRecord::Relation objects
 
       Record.from(subquery)

diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
@@ -123,6 +123,7 @@ def delete
     # Deletes the record in the database and freezes this instance to reflect
     # that no changes should be made (since they can't be persisted).
     def destroy
+      raise ReadOnlyRecord if readonly?
       destroy_associations
       destroy_row if persisted?
       @destroyed = true

diff --git a/activerecord/test/cases/readonly_test.rb b/activerecord/test/cases/readonly_test.rb
@@ -23,6 +23,7 @@ def test_cant_save_readonly_record
     end
     assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save  }
     assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save! }
+    assert_raise(ActiveRecord::ReadOnlyRecord) { dev.destroy }
   end