1 files changed, 9 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder/association_query_value.rb b/activerecord/lib/active_record/relation/predicate_builder/association_query_value.rb
index 2fe0f81cab..28c7483c95 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/association_query_value.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/association_query_value.rb
@@ -1,17 +1,22 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   class PredicateBuilder
     class AssociationQueryValue # :nodoc:
-      attr_reader :associated_table, :value
-
       def initialize(associated_table, value)
         @associated_table = associated_table
         @value = value
       end
 
       def queries
-        [associated_table.association_foreign_key.to_s => ids]
+        [associated_table.association_join_foreign_key.to_s => ids]
       end
 
+      # TODO Change this to private once we've dropped Ruby 2.2 support.
+      # Workaround for Ruby 2.2 "private attribute?" warning.
+      protected
+        attr_reader :associated_table, :value
+
       private
         def ids
           case value
@@ -25,7 +30,7 @@ module ActiveRecord
         end
 
         def primary_key
-          associated_table.association_primary_key
+          associated_table.association_join_primary_key
         end
 
         def convert_to_id(value)