From d300256ca4dd8b6f921afe8ef2de05d7e9c084e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 8 Oct 2013 23:56:34 -0300 Subject: Use the reflection name instead of the accessor --- activerecord/lib/active_record/associations/builder/association.rb | 1 + .../lib/active_record/associations/builder/singular_association.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index dc1fec17bf..fa46ea060e 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -86,6 +86,7 @@ module ActiveRecord::Associations::Builder # Post.first.comments and Post.first.comments= methods are defined by this method... def define_accessors(model, reflection) mixin = model.generated_feature_methods + name = reflection.name self.class.define_readers(mixin, name) self.class.define_writers(mixin, name) end diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb index 24429628bc..4dc45d4d25 100644 --- a/activerecord/lib/active_record/associations/builder/singular_association.rb +++ b/activerecord/lib/active_record/associations/builder/singular_association.rb @@ -8,7 +8,7 @@ module ActiveRecord::Associations::Builder def define_accessors(model, reflection) super - self.class.define_constructors(model.generated_feature_methods, name) if reflection.constructable? + self.class.define_constructors(model.generated_feature_methods, reflection.name) if reflection.constructable? end # Defines the (build|create)_association methods for belongs_to or has_one association -- cgit v1.2.3