aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/reflection.rb
diff options
context:
space:
mode:
authorJean Boussier <jean.boussier@gmail.com>2019-04-10 16:03:14 +0200
committerJean Boussier <jean.boussier@gmail.com>2019-04-10 16:03:14 +0200
commit314d66b5a14d20a84228ec0f59a897d491d43932 (patch)
treea1a6cef10806481d7fd65c8e2b910a3b04f208ca /activerecord/lib/active_record/reflection.rb
parenta8328f61b6b958140738d5c31438132b20089c93 (diff)
downloadrails-314d66b5a14d20a84228ec0f59a897d491d43932.tar.gz
rails-314d66b5a14d20a84228ec0f59a897d491d43932.tar.bz2
rails-314d66b5a14d20a84228ec0f59a897d491d43932.zip
Deduplicate Active Record reflection names
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
-rw-r--r--activerecord/lib/active_record/reflection.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 3452cf971b..1312bf6f91 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -21,12 +21,12 @@ module ActiveRecord
def add_reflection(ar, name, reflection)
ar.clear_reflections_cache
- name = name.to_s
+ name = -name.to_s
ar._reflections = ar._reflections.except(name).merge!(name => reflection)
end
def add_aggregate_reflection(ar, name, reflection)
- ar.aggregate_reflections = ar.aggregate_reflections.merge(name.to_s => reflection)
+ ar.aggregate_reflections = ar.aggregate_reflections.merge(-name.to_s => reflection)
end
private