diff options
author | Lauro Caetano <laurocaetano1@gmail.com> | 2014-01-30 22:58:00 -0200 |
---|---|---|
committer | Lauro Caetano <laurocaetano1@gmail.com> | 2014-01-31 00:29:48 -0200 |
commit | 4506dd2f07be824fd7e0eb6165c29994aeb1bfcd (patch) | |
tree | 3595afcd1b68b2d86891644a298e0a70ccf94077 /activerecord/lib/active_record/associations | |
parent | f64c50a092394917ad9a79abc563aa2bef22ce94 (diff) | |
download | rails-4506dd2f07be824fd7e0eb6165c29994aeb1bfcd.tar.gz rails-4506dd2f07be824fd7e0eb6165c29994aeb1bfcd.tar.bz2 rails-4506dd2f07be824fd7e0eb6165c29994aeb1bfcd.zip |
Associations now raise `ArgumentError` on name conflicts.
Dangerous association names conflicts include instance or class
methods already defined by `ActiveRecord::Base`.
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 3911d1b520..f085fd1cfd 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -26,6 +26,12 @@ module ActiveRecord::Associations::Builder attr_reader :name, :scope, :options def self.build(model, name, scope, options, &block) + if model.dangerous_attribute_method?(name) + raise ArgumentError, "You tried to define an association named #{name} on the model #{model.name}, but " \ + "this will conflict with a method #{name} already defined by Active Record. " \ + "Please choose a different association name." + end + builder = create_builder model, name, scope, options, &block reflection = builder.build(model) define_accessors model, reflection |