Merge branch 'core' into versions_updates

rubysherpas · Nov 2, 2017 · c332f2a · c332f2a
2 parents 7ccd9d4 + 3092f36
commit c332f2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/paranoia.rb b/lib/paranoia.rb
@@ -165,7 +165,7 @@ def really_destroy!
             association_data.really_destroy!
           end
         end
-        write_attribute(paranoia_column, current_time_from_proper_timezone)
+        update_columns(paranoia_destroy_attributes)
         destroy_without_paranoia
       end
     end

diff --git a/test/paranoia_test.rb b/test/paranoia_test.rb
@@ -550,6 +550,14 @@ def test_really_destroy_behavior_for_callbacks
     assert model.instance_variable_get(:@real_destroy_callback_called)
   end
 
+  def test_really_destroy_behavior_for_active_column_model
+    model = ActiveColumnModel.new
+    model.save
+    model.really_destroy!
+
+    refute ParanoidModel.unscoped.exists?(model.id)
+  end
+
   def test_really_delete
     model = ParanoidModel.new
     model.save