diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-03 22:11:39 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-04 22:55:16 +0900 |
| commit | 652258e41a882acccdb9a3ce211dbf356e738b28 (patch) | |
| tree | 3d35a5e75e5ac0ba5be027aa8b341238f3902d40 /activerecord/lib/active_record | |
| parent | 092c547d7fca936c7a1fe39a1bdca6bc8d98940c (diff) | |
| download | rails-652258e41a882acccdb9a3ce211dbf356e738b28.tar.gz rails-652258e41a882acccdb9a3ce211dbf356e738b28.tar.bz2 rails-652258e41a882acccdb9a3ce211dbf356e738b28.zip | |
Fix newly added reflection order when redefining association
Currently reflections keeps the order when first added even if when
redefining association. As a result of the order, redefining through
association which use newly added association will raise
`HasManyThroughOrderError`. We need to redefine reflection order as well
when redefining association.
Fixes #31068.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index a3f8bfd1f1..9e32b69786 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -34,7 +34,8 @@ module ActiveRecord def self.add_reflection(ar, name, reflection) ar.clear_reflections_cache - ar._reflections = ar._reflections.merge(name.to_s => reflection) + name = name.to_s + ar._reflections = ar._reflections.except(name).merge!(name => reflection) end def self.add_aggregate_reflection(ar, name, reflection) |