Wrap up attribute method reset concerns in 'undefine_attribute_methods'

rails · Jul 30, 2009 · e129c56 · e129c56
1 parent 586baf8
commit e129c56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
@@ -79,6 +79,11 @@ def define_attribute_methods
         end
       end
 
+      def undefine_attribute_methods
+        generated_methods.each { |name| undef_method(name) }
+        @generated_methods = nil
+      end
+
       # Checks whether the method is defined in the model or any of its subclasses
       # that also derive from Active Record.
       def instance_method_already_implemented?(method_name)

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
@@ -1397,8 +1397,8 @@ def column_methods_hash #:nodoc:
       #    end
       #  end
       def reset_column_information
-        generated_methods.each { |name| undef_method(name) }
-        @column_names = @columns = @columns_hash = @content_columns = @dynamic_methods_hash = @generated_methods = @inheritance_column = nil
+        undefine_attribute_methods
+        @column_names = @columns = @columns_hash = @content_columns = @dynamic_methods_hash = @inheritance_column = nil
       end
 
       def reset_column_information_and_inheritable_attributes_for_all_subclasses#:nodoc: