diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-08-10 16:00:09 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-08-10 17:45:07 +0100 |
commit | ea8181b65637af65db5bb834f1c86df57969516e (patch) | |
tree | cc2cf5d4ae5100bb67f2db78ff0e3652af7d595e /activerecord/lib/active_record/associations/builder/association.rb | |
parent | 08fb3c8f33a17a3c8cc71a1e58110662eb37e429 (diff) | |
download | rails-ea8181b65637af65db5bb834f1c86df57969516e.tar.gz rails-ea8181b65637af65db5bb834f1c86df57969516e.tar.bz2 rails-ea8181b65637af65db5bb834f1c86df57969516e.zip |
move dependency logic out of generated methods
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/association.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 24 |
1 files changed, 0 insertions, 24 deletions
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 |