aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2013-09-28 12:23:58 +0900
committerkennyj <kennyj@gmail.com>2013-09-28 12:26:23 +0900
commit8e814a0ac0768816974d2bfd68d33d931592751e (patch)
treee293b073839899f8b2e639b7f524605515f41bf4 /activerecord/lib/active_record/associations
parent3e0a60e4e2316ee696bdcf1c115582f8f450ad07 (diff)
downloadrails-8e814a0ac0768816974d2bfd68d33d931592751e.tar.gz
rails-8e814a0ac0768816974d2bfd68d33d931592751e.tar.bz2
rails-8e814a0ac0768816974d2bfd68d33d931592751e.zip
Renamed generated_feature_methods to generated_association_methods.
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/builder/association.rb2
-rw-r--r--activerecord/lib/active_record/associations/builder/singular_association.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb
index 1059fc032d..17b74b197e 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -83,7 +83,7 @@ module ActiveRecord::Associations::Builder
# Post.first.comments and Post.first.comments= methods are defined by this method...
def define_accessors(model)
- mixin = model.generated_feature_methods
+ mixin = model.generated_association_methods
define_readers(mixin)
define_writers(mixin)
end
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb
index d97c0e9afd..e81cc99278 100644
--- a/activerecord/lib/active_record/associations/builder/singular_association.rb
+++ b/activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -12,7 +12,7 @@ module ActiveRecord::Associations::Builder
def define_accessors(model)
super
- define_constructors(model.generated_feature_methods) if constructable?
+ define_constructors(model.generated_association_methods) if constructable?
end
# Defines the (build|create)_association methods for belongs_to or has_one association