1 files changed, 32 insertions, 21 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 e81be63cd3..7e20cb2c63 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
@@ -1,6 +1,17 @@
 module ActiveRecord
   class PredicateBuilder
     class AssociationQueryHandler # :nodoc:
+      def self.value_for(table, column, value)
+        associated_table = table.associated_table(column)
+        klass = if associated_table.polymorphic_association? && ::Array === value && value.first.is_a?(Base)
+          PolymorphicArrayValue
+        else
+          AssociationQueryValue
+        end
+
+        klass.new(associated_table, value)
+      end
+
       def initialize(predicate_builder)
         @predicate_builder = predicate_builder
       end
@@ -19,7 +30,7 @@ module ActiveRecord
 
       protected
 
-      attr_reader :predicate_builder
+        attr_reader :predicate_builder
     end
 
     class AssociationQueryValue # :nodoc:
@@ -49,30 +60,30 @@ module ActiveRecord
 
       private
 
-      def primary_key
-        associated_table.association_primary_key(base_class)
-      end
+        def primary_key
+          associated_table.association_primary_key(base_class)
+        end
 
-      def polymorphic_base_class_from_value
-        case value
-        when Relation
-          value.klass.base_class
-        when Array
-          val = value.compact.first
-          val.class.base_class if val.is_a?(Base)
-        when Base
-          value.class.base_class
+        def polymorphic_base_class_from_value
+          case value
+          when Relation
+            value.klass.base_class
+          when Array
+            val = value.compact.first
+            val.class.base_class if val.is_a?(Base)
+          when Base
+            value.class.base_class
+          end
         end
-      end
 
-      def convert_to_id(value)
-        case value
-        when Base
-          value._read_attribute(primary_key)
-        else
-          value
+        def convert_to_id(value)
+          case value
+          when Base
+            value._read_attribute(primary_key)
+          else
+            value
+          end
         end
-      end
     end
   end
 end