1 files changed, 20 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 5028cee32d..f1d061133c 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -380,6 +380,18 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert_equal subscriptions, subscriber.subscriptions.sort_by(&:id)
   end
 
+  def test_string_id_column_joins
+    s = Subscriber.create! do |c|
+      c.id = "PL"
+    end
+
+    b = Book.create!
+
+    Subscription.create!(:subscriber_id => "PL", :book_id => b.id)
+    s.reload
+    s.book_ids = s.book_ids
+  end
+
   def test_eager_load_has_many_through_with_string_keys
     books = books(:awdr, :rfr)
     subscriber = Subscriber.find(subscribers(:second).id, :include => :books)
@@ -1028,4 +1040,12 @@ class EagerAssociationTest < ActiveRecord::TestCase
     }
     assert_no_queries { assert_equal groucho, sponsor.thing }
   end
+
+  def test_joins_with_includes_should_preload_via_joins
+    post = assert_queries(1) { Post.includes(:comments).joins(:comments).order('posts.id desc').to_a.first }
+
+    assert_queries(0) do
+      assert_not_equal 0, post.comments.to_a.count
+    end
+  end
 end