aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2014-05-24 14:03:30 -0400
committerArthur Neves <arthurnn@gmail.com>2014-05-24 14:55:20 -0400
commit09ac448a8eff73ffb7a3f683207802e8cb1f6d0b (patch)
tree668528eedc99f79d91431c7b7dd6acccd42d5221 /activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
parente2bd0eb758100a5d6f55201318809a7ed7b37040 (diff)
downloadrails-09ac448a8eff73ffb7a3f683207802e8cb1f6d0b.tar.gz
rails-09ac448a8eff73ffb7a3f683207802e8cb1f6d0b.tar.bz2
rails-09ac448a8eff73ffb7a3f683207802e8cb1f6d0b.zip
Merge pull request #15210 from arthurnn/fix_hbtm_reflection
Fix habtm reflection Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/reflection_test.rb
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb')
-rw-r--r--activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
index 30b11c01eb..0ad5206980 100644
--- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
@@ -66,13 +66,13 @@ module ActiveRecord::Associations::Builder
def self.add_left_association(name, options)
belongs_to name, options
- self.left_reflection = reflect_on_association(name)
+ self.left_reflection = _reflect_on_association(name)
end
def self.add_right_association(name, options)
rhs_name = name.to_s.singularize.to_sym
belongs_to rhs_name, options
- self.right_reflection = reflect_on_association(rhs_name)
+ self.right_reflection = _reflect_on_association(rhs_name)
end
}