kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #26394 from kamipo/remove_redundant_condition

Browse source 
Remove redundant `!loaded?` condition
This commit is contained in:
Andrew White 2016-09-06 10:52:01 +01:00 committed by GitHub
commit 38fae35d53
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/associations/collection_association.rb
View file

@ -227,9 +227,9 @@ module ActiveRecord
else
target.size
end
elsif !loaded? && !association_scope.group_values.empty?
elsif !association_scope.group_values.empty?
load_target.size
elsif !loaded? && !association_scope.distinct_value && target.is_a?(Array)
elsif !association_scope.distinct_value && target.is_a?(Array)
unsaved_records = target.select(&:new_record?)
unsaved_records.size + count_records
else