diff options
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 7cb4326754..44b0956e4e 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -52,7 +52,7 @@ module ActiveRecord 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 index 8143e31f26..4f118e46a9 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -67,7 +67,7 @@ module ActiveRecord # The connection handler class_attribute :connection_handler, :instance_writer => false - initialize_generated_modules + initialize_generated_modules unless self == Base end module ClassMethods |