aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods.rb
diff options
context:
space:
mode:
authorJosh Susser <josh@hasmanythrough.com>2011-11-14 22:57:15 -0800
committerJosh Susser <josh@hasmanythrough.com>2011-11-15 23:32:58 -0800
commit7cba6a37848ba96b4decec885779fb309d71c339 (patch)
treedd1c38690fd0551dd248dfe6005f7532a35e49b1 /activerecord/lib/active_record/attribute_methods.rb
parent8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f (diff)
downloadrails-7cba6a37848ba96b4decec885779fb309d71c339.tar.gz
rails-7cba6a37848ba96b4decec885779fb309d71c339.tar.bz2
rails-7cba6a37848ba96b4decec885779fb309d71c339.zip
association methods are now generated in modules
Instead of generating association methods directly in the model class, they are generated in an anonymous module which is then included in the model class. There is one such module for each association. The only subtlety is that the generated_attributes_methods module (from ActiveModel) must be forced to be included before association methods are created so that attribute methods will not shadow association methods.
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods.rb')
-rw-r--r--activerecord/lib/active_record/attribute_methods.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index d7bfaa5655..2d720fe700 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -8,6 +8,12 @@ module ActiveRecord
include ActiveModel::AttributeMethods
module ClassMethods
+ def inherited(child_class)
+ # force creation + include before accessor method modules
+ child_class.generated_attribute_methods
+ super
+ end
+
# Generates all the attribute related methods for columns in the database
# accessors, mutators and query methods.
def define_attribute_methods