Skip to content
Browse files

Revert "Merge pull request #10901 from armstrjare/fix_query_null_fore…

…ign_key_on_new_record_collection_ids_reader"

This reverts commit 6675d71, reversing
changes made to 919d1a1.

I missed to check the target branch and wrongly merged it into 3-2-stable directly.
  • Loading branch information...
1 parent 6675d71 commit 5009b078875e596a2fba7827336f7548aa6e35ac @senny senny committed
View
6 activerecord/CHANGELOG.md
@@ -4,12 +4,6 @@
*Yves Senn*
-* Prevent query with NULL foreign key value on CollectionAssociation#ids_reader
- for non-persisted records. Fixes bug where Company.new.contract_ids would
- incorrectly load all non-associated Contracts.
-
- *Jared Armstrong*
-
* Fix the `:primary_key` option for `has_many` associations.
Fixes #10693.
View
2 activerecord/lib/active_record/associations/collection_association.rb
@@ -43,7 +43,7 @@ def writer(records)
# Implements the ids reader method, e.g. foo.item_ids for Foo.has_many :items
def ids_reader
- if owner.new_record? || loaded? || options[:finder_sql]
+ if loaded? || options[:finder_sql]
load_target.map do |record|
record.send(reflection.association_primary_key)
end
View
27 activerecord/test/cases/associations/has_many_associations_test.rb
@@ -1311,33 +1311,6 @@ def test_get_ids_for_unloaded_associations_does_not_load_them
assert !company.clients.loaded?
end
- def test_get_ids_for_association_on_new_record_does_not_try_to_find_records
- Company.columns # Load schema information so we don't query below
- Contract.columns # if running just this test.
-
- company = Company.new
- assert_queries(0) do
- company.contract_ids
- end
-
- assert_equal [], company.contract_ids
- end
-
- def test_set_ids_for_association_on_new_record_applies_association_correctly
- contract_a = Contract.create!
- contract_b = Contract.create!
- another_contract = Contract.create!
- company = Company.new(:name => "Some Company")
-
- company.contract_ids = [contract_a.id, contract_b.id]
- assert_equal [contract_a.id, contract_b.id], company.contract_ids
- assert_equal [contract_a, contract_b], company.contracts
-
- company.save!
- assert_equal company, contract_a.reload.company
- assert_equal company, contract_b.reload.company
- end
-
def test_get_ids_ignores_include_option
assert_equal [readers(:michael_welcome).id], posts(:welcome).readers_with_person_ids
end

0 comments on commit 5009b07

Please sign in to comment.
Something went wrong with that request. Please try again.