diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-21 03:28:18 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-21 03:28:18 +1030 |
| commit | cdd45fa09d76f7c16ccbb6682e672a44f82174a0 (patch) | |
| tree | 669f8316541c06bcf18692d7b4f6f9ba904ce119 /activerecord/lib/active_record/relation/spawn_methods.rb | |
| parent | 4f44348602446217df89536e911f516b065de33a (diff) | |
| download | rails-cdd45fa09d76f7c16ccbb6682e672a44f82174a0.tar.gz rails-cdd45fa09d76f7c16ccbb6682e672a44f82174a0.tar.bz2 rails-cdd45fa09d76f7c16ccbb6682e672a44f82174a0.zip | |
Mutating the result of Relation#to_a should not affect the relation
Clarifying this separation and enforcing relation immutability is the
culmination of the previous efforts to remove the mutator method
delegations.
Diffstat (limited to 'activerecord/lib/active_record/relation/spawn_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/spawn_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index 67d7f83cb4..d5c18a2a4a 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -29,7 +29,7 @@ module ActiveRecord # This is mainly intended for sharing common conditions between multiple associations. def merge(other) if other.is_a?(Array) - to_a & other + records & other elsif other spawn.merge!(other) else |