aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder/belongs_to.rb
diff options
context:
space:
mode:
authorHrvoje Šimić <shime.ferovac@gmail.com>2012-07-14 15:21:30 +0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-08-01 11:33:12 -0300
commit08a6b5753ed65244c793bab455c26454ab1a1dc5 (patch)
tree0f64c7847ec5d07ee3f915aa6d2e02b56c837c1f /activerecord/lib/active_record/associations/builder/belongs_to.rb
parentc10202208982bfa02ffd16d1614992228391d781 (diff)
downloadrails-08a6b5753ed65244c793bab455c26454ab1a1dc5.tar.gz
rails-08a6b5753ed65244c793bab455c26454ab1a1dc5.tar.bz2
rails-08a6b5753ed65244c793bab455c26454ab1a1dc5.zip
move method for dependent option check
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/belongs_to.rb')
-rw-r--r--activerecord/lib/active_record/associations/builder/belongs_to.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb
index 4bef996297..277bec6f72 100644
--- a/activerecord/lib/active_record/associations/builder/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -73,9 +73,8 @@ module ActiveRecord::Associations::Builder
def configure_dependency
if options[:dependent]
- unless options[:dependent].in?([:destroy, :delete])
- raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{options[:dependent].inspect})"
- end
+
+ check_dependent_valid [:destroy, :delete]
method_name = "belongs_to_dependent_#{options[:dependent]}_for_#{name}"
model.send(:class_eval, <<-eoruby, __FILE__, __LINE__ + 1)
@@ -85,6 +84,7 @@ module ActiveRecord::Associations::Builder
end
eoruby
model.after_destroy method_name
+
end
end
end