Check that has_one references a paranoid model

f185ce8a · John Hawthorn · d97417a2 · f185ce8a
Commit f185ce8a authored Jan 18, 2015 by John Hawthorn
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

lib/paranoia.rb
+4 -1

No files found.
--- a/lib/paranoia.rb
+++ b/lib/paranoia.rb
@@ -152,7 +152,10 @@ module Paranoia
          association_find_conditions = { association_foreign_key => self.id }
        end

-        Object.const_get(association_class_name).only_deleted.where(association_find_conditions).first.try(:restore, recursive: true)
+        association_class = Object.const_get(association_class_name)
+        if association_class.paranoid?
+          association_class.only_deleted.where(association_find_conditions).first.try!(:restore, recursive: true)
+        end
      end
    end