Fix warnings.

Make sure we don't redefine an already-defined attribute method.
rails · Sep 12, 2011 · 3386a08 · 3386a08
1 parent 99bd6b5
commit 3386a08
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
@@ -36,7 +36,7 @@ def instance_method_already_implemented?(method_name)
 
         @@_defined_activerecord_methods ||= defined_activerecord_methods
         raise DangerousAttributeError, "#{method_name} is defined by ActiveRecord" if @@_defined_activerecord_methods.include?(method_name)
-        @_defined_class_methods.include?(method_name)
+        @_defined_class_methods.include?(method_name) || generated_attribute_methods.method_defined?(method_name)
       end
 
       def defined_activerecord_methods