diff options
| author | Florian Ebeling <florian.ebeling@gmail.com> | 2018-09-23 17:56:05 +0200 |
|---|---|---|
| committer | Florian Ebeling <florian.ebeling@gmail.com> | 2018-11-06 17:56:58 +0100 |
| commit | 11bad94237b17c078eb5cac8557e9ed9e37ec274 (patch) | |
| tree | fd23a81c977e63d83c09f8728cd5401f0590fe8e /activerecord | |
| parent | 8104589c0824c648a769be50e04fc8e7dbb26ba0 (diff) | |
| download | rails-11bad94237b17c078eb5cac8557e9ed9e37ec274.tar.gz rails-11bad94237b17c078eb5cac8557e9ed9e37ec274.tar.bz2 rails-11bad94237b17c078eb5cac8557e9ed9e37ec274.zip | |
Rename union to intersection
Diffstat (limited to 'activerecord')
3 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 17f028c1a2..48bb9ab066 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -425,7 +425,7 @@ module ActiveRecord end def replace_common_records_in_memory(new_target, original_target) - common_records = union(new_target, original_target) + common_records = intersection(new_target, original_target) common_records.each do |record| skip_callbacks = true replace_on_target(record, @target.index(record), skip_callbacks) diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 6beec4dea4..e224d3456a 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -135,7 +135,7 @@ module ActiveRecord a - b end - def union(a, b) + def intersection(a, b) a & b end end diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index b30d3ddac2..8a8149b777 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -170,7 +170,7 @@ module ActiveRecord from_set(set_a - set_b) end - def union(a, b) + def intersection(a, b) set_a = as_set(a) set_b = as_set(b) |