From e1dd15df820f9ec6002d06e6614184647d1ad1ad Mon Sep 17 00:00:00 2001 From: Hassanin Ahmed Date: Wed, 23 Mar 2022 11:08:23 +0800 Subject: [PATCH] separates deletion_time from paranoia_column_value (#532) --- lib/paranoia.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/paranoia.rb b/lib/paranoia.rb index 453a4e69..8ce62933 100644 --- a/lib/paranoia.rb +++ b/lib/paranoia.rb @@ -138,7 +138,7 @@ def within_recovery_window?(recovery_window_range) end def paranoia_destroyed? - deletion_time != paranoia_sentinel_value + paranoia_column_value != paranoia_sentinel_value end alias :deleted? :paranoia_destroyed? @@ -296,12 +296,16 @@ def paranoia_column self.class.paranoia_column end + def paranoia_column_value + send(paranoia_column) + end + def paranoia_sentinel_value self.class.paranoia_sentinel_value end def deletion_time - send(paranoia_column) + paranoia_column_value.acts_like?(:time) ? paranoia_column_value : deleted_at end end end