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 325fc58958..c6e451fc57 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1040,4 +1040,24 @@ 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
+
+  def test_join_eager_with_empty_order_should_generate_valid_sql
+    assert_nothing_raised(ActiveRecord::StatementInvalid) do
+      Post.includes(:comments).order("").where(:comments => {:body => "Thank you for the welcome"}).first
+    end
+  end
+
+  def test_join_eager_with_nil_order_should_generate_valid_sql
+    assert_nothing_raised(ActiveRecord::StatementInvalid) do
+      Post.includes(:comments).order(nil).where(:comments => {:body => "Thank you for the welcome"}).first
+    end
+  end
 end