diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-04-21 21:27:50 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-04-27 22:43:46 +0900 |
| commit | 19c80718afea8cf8f56ee68fcfbe325d54c02906 (patch) | |
| tree | 09a62e19ccb1deefdaebf5813c8e882ef50f6488 /activerecord/lib/active_record/associations/collection_association.rb | |
| parent | 0a8fe15ba8fc7c36253996c557a0012f718d7d60 (diff) | |
| download | rails-19c80718afea8cf8f56ee68fcfbe325d54c02906.tar.gz rails-19c80718afea8cf8f56ee68fcfbe325d54c02906.tar.bz2 rails-19c80718afea8cf8f56ee68fcfbe325d54c02906.zip | |
Ensure that `ids_reader` respects dirty target whether target is loaded or not
Currently `ids_reader` doesn't respect dirty target when the target is
not loaded yet unlike `collection.size`. I believe the inconsistency is
a bug, fixes the `ids_reader` to behave consistently regardless of
whether target is loaded or not.
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index f233947fbd..d61d105544 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -45,6 +45,8 @@ module ActiveRecord def ids_reader if loaded? target.pluck(reflection.association_primary_key) + elsif !target.empty? + load_target.pluck(reflection.association_primary_key) else @association_ids ||= scope.pluck(reflection.association_primary_key) end @@ -212,7 +214,7 @@ module ActiveRecord def size if !find_target? || loaded? target.size - elsif @association_ids && target.empty? + elsif @association_ids @association_ids.size elsif !association_scope.group_values.empty? load_target.size |