diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-02 17:11:35 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-02 17:11:35 -0700 |
| commit | 8eb7561ac6e8f020ec09608532de310c6b0b8dcd (patch) | |
| tree | 18ff18cf84448450653f6ef3f41641cffab012f5 /activerecord | |
| parent | 9f76531c3a7a6ff32515d2238cf26dbd772467d7 (diff) | |
| download | rails-8eb7561ac6e8f020ec09608532de310c6b0b8dcd.tar.gz rails-8eb7561ac6e8f020ec09608532de310c6b0b8dcd.tar.bz2 rails-8eb7561ac6e8f020ec09608532de310c6b0b8dcd.zip | |
initialize generated modules on inclusion and on inheritence
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/attribute_methods/read_test.rb | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index abaa820ac5..701fd4e3fa 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -8,7 +8,7 @@ module ActiveRecord include ActiveModel::AttributeMethods included do - @attribute_methods_generated = false + initialize_generated_modules include Read include Write include BeforeTypeCast diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb index 6dbebf4b6f..c0659fddef 100644 --- a/activerecord/test/cases/attribute_methods/read_test.rb +++ b/activerecord/test/cases/attribute_methods/read_test.rb @@ -15,13 +15,6 @@ module ActiveRecord include ActiveRecord::AttributeMethods - def self.define_attribute_methods - # Created in the inherited/included hook for "proper" ARs - @attribute_methods_mutex ||= Mutex.new - - super - end - def self.column_names %w{ one two three } end |