Dont try to load the record from the db if preloading didn't find anything

2 files changed, 11 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb
index c94b2ff564..95bbaf00cf 100644
--- a/activerecord/lib/active_record/association_preload.rb
+++ b/activerecord/lib/active_record/association_preload.rb
@@ -159,6 +159,11 @@ module ActiveRecord
             association_proxy.__send__(:set_inverse_instance, associated_record, mapped_record)
           end
         end
+
+        id_to_record_map.each do |id, records|
+          next if seen_keys.include?(id.to_s)
+          records.each {|record| record.send("set_#{reflection_name}_target", nil) }            
+        end
       end
 
       # Given a collection of ActiveRecord objects, constructs a Hash which maps
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 42a891bc3b..79e5ecf4ce 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -833,4 +833,10 @@ class EagerAssociationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_preloading_empty_polymorphic_parent
+    t = Tagging.create!(:taggable_type => 'Post', :taggable_id => Post.maximum(:id) + 1, :tag => tags(:general))
+
+    assert_queries(2) { @tagging = Tagging.preload(:taggable).find(t.id) }
+    assert_no_queries { assert ! @tagging.taggable }
+  end
 end