Ensure attribute methods are included after all the AR stuff

rails · Dec 24, 2011 · a1ee3ac · a1ee3ac
1 parent 1029c51
commit a1ee3ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
@@ -52,7 +52,7 @@ def generated_external_attribute_methods
       end
 
       def undefine_attribute_methods
-        super
+        super if attribute_methods_generated?
         @attribute_methods_generated = false
       end
 

diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
@@ -67,7 +67,7 @@ module Core
       # The connection handler
       class_attribute :connection_handler, :instance_writer => false
 
-      initialize_generated_modules
+      initialize_generated_modules unless self == Base
     end
 
     module ClassMethods

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
@@ -76,6 +76,7 @@ def test_generated_methods_modules
     assert(modules.index(Computer.generated_attribute_methods) > modules.index(Computer.generated_feature_methods),
            "generated_attribute_methods must be higher in inheritance hierarchy than generated_feature_methods")
     assert_not_equal Computer.generated_feature_methods, Post.generated_feature_methods
+    assert(modules.index(Computer.generated_attribute_methods) < modules.index(ActiveRecord::Base.ancestors[1]))
   end
 
   def test_column_names_are_escaped