2 files changed, 22 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder/association_query_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/association_query_handler.rb
index aabcf20c1d..159889d3b8 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/association_query_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/association_query_handler.rb
@@ -31,7 +31,14 @@ module ActiveRecord
       end
 
       def ids
-        value
+        case value
+        when Relation
+          value.select(primary_key)
+        when Array
+          value.map { |v| convert_to_id(v) }
+        else
+          convert_to_id(value)
+        end
       end
 
       def base_class
@@ -42,6 +49,10 @@ module ActiveRecord
 
       private
 
+      def primary_key
+        associated_table.association_primary_key(base_class)
+      end
+
       def polymorphic_base_class_from_value
         case value
         when Relation
@@ -53,6 +64,15 @@ module ActiveRecord
           value.class.base_class
         end
       end
+
+      def convert_to_id(value)
+        case value
+        when Base
+          value._read_attribute(primary_key)
+        else
+          value
+        end
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/table_metadata.rb b/activerecord/lib/active_record/table_metadata.rb
index 6c8792ee80..3dd6321a97 100644
--- a/activerecord/lib/active_record/table_metadata.rb
+++ b/activerecord/lib/active_record/table_metadata.rb
@@ -1,6 +1,7 @@
 module ActiveRecord
   class TableMetadata # :nodoc:
     delegate :foreign_type, :foreign_key, to: :association, prefix: true
+    delegate :association_primary_key, to: :association
 
     def initialize(klass, arel_table, association = nil)
       @klass = klass