Merge PR rails#43517

Author: rafaelfranca

activerecord/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Ignore persisted in-memory records when merging target lists.
+
+    *Kevin Sjöberg*
+
 *   Add a new option `:update_only` to `upsert_all` to configure the list of columns to update in case of conflict.
 
     Before, you could only customize the update SQL sentence via `:on_duplicate`. There is now a new option `:update_only` that lets you provide a list of columns to update in case of conflict:

activerecord/lib/active_record/associations/collection_association.rb

@@ -335,7 +335,7 @@ def merge_target_lists(persisted, memory)
             end
           end
 
-          persisted + memory
+          persisted + memory.reject(&:persisted?)
         end
 
         def _create_record(attributes, raise = false, &block)

activerecord/test/cases/associations_test.rb

@@ -289,6 +289,16 @@ def test_reset_unloads_target
     assert_not_predicate david.posts, :loaded?
     assert_not_predicate david.posts, :loaded
   end
+
+  def test_target_merging_ignores_persisted_in_memory_records
+    david = authors(:david)
+    assert david.thinking_posts.include?(posts(:thinking))
+
+    david.thinking_posts.create!(title: "Something else entirely", body: "Does not matter.")
+
+    assert_equal 1, david.thinking_posts.size
+    assert_equal 1, david.thinking_posts.to_a.size
+  end
 end
 
 class OverridingAssociationsTest < ActiveRecord::TestCase