1 files changed, 17 insertions, 0 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index ae1dc35bff..4edaf79e9a 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1806,6 +1806,10 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal post, custom_post_relation.joins(:author).where!(title: post.title).take
   end
 
+  test "arel_attribute respects a custom table" do
+    assert_equal [posts(:welcome)], custom_post_relation.ranked_by_comments.limit_by(1).to_a
+  end
+
   test "#load" do
     relation = Post.all
     assert_queries(1) do
@@ -1912,6 +1916,19 @@ class RelationTest < ActiveRecord::TestCase
     end
   end
 
+  test "#where with set" do
+    david = authors(:david)
+    mary = authors(:mary)
+
+    authors = Author.where(name: ["David", "Mary"].to_set)
+    assert_equal [david, mary], authors
+  end
+
+  test "#where with empty set" do
+    authors = Author.where(name: Set.new)
+    assert_empty authors
+  end
+
   private
     def custom_post_relation
       table_alias = Post.arel_table.alias("omg_posts")