diff options
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 5 | ||||
| -rwxr-xr-x | activerecord/test/associations_test.rb | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 3ae42ddac7..657c575866 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -82,9 +82,10 @@ module ActiveRecord # Check to see if the method is defined in the model or any of its subclasses that also derive from ActiveRecord. # Raise DangerousAttributeError if the method is defined by ActiveRecord though. def instance_method_already_implemented?(method_name) + method_name = method_name.to_s return true if method_name =~ /^id(=$|\?$|$)/ - @_defined_class_methods ||= Set.new(ancestors.first(ancestors.index(ActiveRecord::Base)).collect! { |m| m.public_instance_methods(false) | m.private_instance_methods(false) | m.protected_instance_methods(false) }.flatten) - @@_defined_activerecord_methods ||= Set.new(ActiveRecord::Base.public_instance_methods(false) | ActiveRecord::Base.private_instance_methods(false) | ActiveRecord::Base.protected_instance_methods(false)) + @_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 + @@_defined_activerecord_methods ||= (ActiveRecord::Base.public_instance_methods(false) | ActiveRecord::Base.private_instance_methods(false) | ActiveRecord::Base.protected_instance_methods(false)).map(&: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 diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index e35233a1b8..88b9020753 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -2033,7 +2033,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase end def test_get_ids - assert_equal projects(:active_record, :action_controller).map(&:id), developers(:david).project_ids + assert_equal projects(:active_record, :action_controller).map(&:id).sort, developers(:david).project_ids.sort assert_equal [projects(:active_record).id], developers(:jamis).project_ids end |