0
@@ -1,5 +1,7 @@
0
 *Edge*
0
 
0
+* Add Model#delete instance method, similar to Model.delete class method. #1086 [Hongli Lai]
0
+
0
 * MySQL: cope with quirky default values for not-null text columns.  #1043 [Frederick Cheung]
0
 
0
 * Multiparameter attributes skip time zone conversion for time-only columns [#1030 state:resolved] [Geoff Buesing]

0
@@ -1470,7 +1470,7 @@ module ActiveRecord
0
                 method_name = "has_one_dependent_delete_for_#{reflection.name}".to_sym
0
                 define_method(method_name) do
0
                   association = send(reflection.name)
0
-                  association.class.delete(association.id) unless association.nil?
0
+                  association.delete unless association.nil?
0
                 end
0
                 before_destroy method_name
0
               when :nullify
0
@@ -1500,7 +1500,7 @@ module ActiveRecord
0
                 method_name = "belongs_to_dependent_delete_for_#{reflection.name}".to_sym
0
                 define_method(method_name) do
0
                   association = send(reflection.name)
0
-                  association.class.delete(association.id) unless association.nil?
1
+                  association.delete unless association.nil?
0
                 end
0
                 before_destroy method_name
0
               else

0
@@ -2306,6 +2306,16 @@ module ActiveRecord #:nodoc:
0
 
0
       # Deletes the record in the database and freezes this instance to reflect that no changes should
0
       # be made (since they can't be persisted).
0
+      #
0
+      # Unlike #destroy, this method doesn't run any +before_delete+ and +after_delete+
0
+      # callbacks, nor will it enforce any association +:dependent+ rules.
0
+      def delete
0
+        self.class.delete(id) unless new_record?
0
+        freeze
0
+      end
0
+
0
+      # Deletes the record in the database and freezes this instance to reflect that no changes should
0
+      # be made (since they can't be persisted).
0
       def destroy
0
         unless new_record?
0
           connection.delete <<-end_sql, "#{self.class.name} Destroy"

0
@@ -472,6 +472,18 @@ class BasicsTest < ActiveRecord::TestCase
0
     assert topic.instance_variable_get("@custom_approved")
0
   end
0
 
0
+  def test_delete
0
+    topic = Topic.find(1)
0
+    assert_equal topic, topic.delete, 'topic.delete did not return self'
0
+    assert topic.frozen?, 'topic not frozen after delete'
0
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
0
+  end
0
+
0
+  def test_delete_doesnt_run_callbacks
0
+    Topic.find(1).delete
0
+    assert_not_nil Topic.find(2)
0
+  end
0
+
0
   def test_destroy
0
     topic = Topic.find(1)
0
     assert_equal topic, topic.destroy, 'topic.destroy did not return self'
0
@@ -820,6 +832,20 @@ class BasicsTest < ActiveRecord::TestCase
0
     assert_equal [ Topic.find(1) ], [ Topic.find(2).topic ] & [ Topic.find(1) ]
0
   end
0
 
0
+  def test_delete_new_record
0
+    client = Client.new
0
+    client.delete
0
+    assert client.frozen?
0
+  end
0
+
0
+  def test_delete_record_with_associations
0
+    client = Client.find(3)
0
+    client.delete
0
+    assert client.frozen?
0
+    assert_kind_of Firm, client.firm
0
+    assert_raises(ActiveSupport::FrozenObjectError) { client.name = "something else" }
0
+  end
0
+
0
   def test_destroy_new_record
0
     client = Client.new
0
     client.destroy