From 3e58f8e19117346ce459b7531379525d3143608a Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Thu, 30 Jul 2009 00:07:10 -0500 Subject: Restore DangerousAttributeError --- activerecord/lib/active_record/attribute_methods.rb | 12 +++++++++--- activerecord/lib/active_record/base.rb | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 8370c212ca..c7e6fe6a29 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -85,10 +85,14 @@ module ActiveRecord end # Checks whether the method is defined in the model or any of its subclasses - # that also derive from Active Record. + # that also derive from Active Record. Raises DangerousAttributeError if the + # method is defined by Active Record though. def instance_method_already_implemented?(method_name) method_name = method_name.to_s - @_defined_class_methods ||= ancestors.first(ancestors.index(ActiveRecord::Base)).sum([]) { |m| m.public_instance_methods(false) | m.private_instance_methods(false) | m.protected_instance_methods(false) }.map(&:to_s).to_set + return true if method_name =~ /^id(=$|\?$|_before_type_cast$|$)/ + @_defined_class_methods ||= ancestors.first(ancestors.index(ActiveRecord::Base)).sum([]) { |m| m.public_instance_methods(false) | m.private_instance_methods(false) | m.protected_instance_methods(false) }.map {|m| m.to_s }.to_set + @@_defined_activerecord_methods ||= (ActiveRecord::Base.public_instance_methods(false) | ActiveRecord::Base.private_instance_methods(false) | ActiveRecord::Base.protected_instance_methods(false)).map{|m| m.to_s }.to_set + raise DangerousAttributeError, "#{method_name} is defined by ActiveRecord" if @@_defined_activerecord_methods.include?(method_name) @_defined_class_methods.include?(method_name) end @@ -105,7 +109,9 @@ module ActiveRecord # Evaluate the definition for an attribute related method def evaluate_attribute_method(attr_name, method_definition, method_name) - generated_methods << method_name + unless method_name.to_s == primary_key.to_s + generated_methods << method_name + end begin class_eval(method_definition, __FILE__, __LINE__) diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index b93dfaf987..7de5bf8a77 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -144,6 +144,10 @@ module ActiveRecord #:nodoc: class Rollback < ActiveRecordError end + # Raised when attribute has a name reserved by Active Record (when attribute has name of one of Active Record instance methods). + class DangerousAttributeError < ActiveRecordError + end + # Raised when you've tried to access a column which wasn't loaded by your finder. # Typically this is because :select has been specified. class MissingAttributeError < NoMethodError -- cgit v1.2.3