From ea8181b65637af65db5bb834f1c86df57969516e Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 10 Aug 2012 16:00:09 +0100 Subject: move dependency logic out of generated methods --- .../associations/builder/association.rb | 24 ---------------------- 1 file changed, 24 deletions(-) (limited to 'activerecord/lib/active_record/associations/builder/association.rb') diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 14e8f9f8f5..7df666418c 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -89,29 +89,5 @@ module ActiveRecord::Associations::Builder ) end end - - def define_restrict_with_exception_dependency_method - name = self.name - mixin.redefine_method(dependency_method_name) do - has_one_macro = association(name).reflection.macro == :has_one - if has_one_macro ? !send(name).nil? : send(name).exists? - raise ActiveRecord::DeleteRestrictionError.new(name) - end - end - end - alias define_restrict_dependency_method define_restrict_with_exception_dependency_method - - def define_restrict_with_error_dependency_method - name = self.name - mixin.redefine_method(dependency_method_name) do - has_one_macro = association(name).reflection.macro == :has_one - if has_one_macro ? !send(name).nil? : send(name).exists? - key = has_one_macro ? "one" : "many" - errors.add(:base, :"restrict_dependent_destroy.#{key}", - :record => self.class.human_attribute_name(name).downcase) - false - end - end - end end end -- cgit v1.2.3