Ensure empty has_many :through association preloaded via joins is marked as loaded. Fixes #2054.

2 files changed, 10 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 504f25271c..6c878f0f00 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -188,13 +188,12 @@ module ActiveRecord
           association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
           set_target_and_inverse(join_part, association, record)
         else
-          return if row[join_part.aliased_primary_key].nil?
-          association = join_part.instantiate(row)
+          association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
           case macro
           when :has_many, :has_and_belongs_to_many
             other = record.association(join_part.reflection.name)
             other.loaded!
-            other.target.push(association)
+            other.target.push(association) if association
             other.set_inverse_instance(association)
           when :belongs_to
             set_target_and_inverse(join_part, association, record)
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 0b1ba31ac2..5f2328ff95 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -813,4 +813,12 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
       assert !c.save
     end
   end
+
+  def test_preloading_empty_through_association_via_joins
+    person = Person.create!(:first_name => "Gaga")
+    person = Person.where(:id => person.id).where('readers.id = 1 or 1=1').includes(:posts).to_a.first
+
+    assert person.posts.loaded?, 'person.posts should be loaded'
+    assert_equal [], person.posts
+  end
 end