From 95795bcb2f3527d2b48a626e70e298a9665cfc66 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 23 Dec 2011 21:55:05 +0000 Subject: Make generated_feature_methods work with ActiveRecord::Model --- activerecord/lib/active_record/core.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record/core.rb') diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index b3db41f1d3..8143e31f26 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -62,21 +62,26 @@ module ActiveRecord Configuration.define :timestamped_migrations, true included do - ## # :singleton-method: # The connection handler class_attribute :connection_handler, :instance_writer => false + + initialize_generated_modules end module ClassMethods def inherited(child_class) #:nodoc: - # force attribute methods to be higher in inheritance hierarchy than other generated methods - child_class.generated_attribute_methods - child_class.generated_feature_methods + child_class.initialize_generated_modules super end + def initialize_generated_modules + # force attribute methods to be higher in inheritance hierarchy than other generated methods + generated_attribute_methods + generated_feature_methods + end + def generated_feature_methods @generated_feature_methods ||= begin mod = const_set(:GeneratedFeatureMethods, Module.new) -- cgit v1.2.3