diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-06-22 03:11:19 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-06-22 03:11:19 -0700 |
| commit | 6675d713186c270de1c4684bc1e56742ea2e19e1 (patch) | |
| tree | f27bdc5797fdea14ce4040fae4f8c1ab02a26072 /activerecord/lib/active_record | |
| parent | 919d1a19d5e7871d50c1531351fc3f736bad5d07 (diff) | |
| parent | c2377f72d2c7df1103eac73b0eb3781c02ef2e18 (diff) | |
| download | rails-6675d713186c270de1c4684bc1e56742ea2e19e1.tar.gz rails-6675d713186c270de1c4684bc1e56742ea2e19e1.tar.bz2 rails-6675d713186c270de1c4684bc1e56742ea2e19e1.zip | |
Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader
Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 65e882867e..baddb9852f 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -43,7 +43,7 @@ module ActiveRecord # Implements the ids reader method, e.g. foo.item_ids for Foo.has_many :items def ids_reader - if loaded? || options[:finder_sql] + if owner.new_record? || loaded? || options[:finder_sql] load_target.map do |record| record.send(reflection.association_primary_key) end |