1 files changed, 29 insertions, 63 deletions

diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index 67e646bf18..567efce8ae 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -1,23 +1,26 @@
 module ActiveRecord
   class PredicateBuilder # :nodoc:
-    @handlers = []
+    require 'active_record/relation/predicate_builder/array_handler'
+    require 'active_record/relation/predicate_builder/association_query_handler'
+    require 'active_record/relation/predicate_builder/base_handler'
+    require 'active_record/relation/predicate_builder/basic_object_handler'
+    require 'active_record/relation/predicate_builder/class_handler'
+    require 'active_record/relation/predicate_builder/range_handler'
+    require 'active_record/relation/predicate_builder/relation_handler'
 
-    autoload :RelationHandler, 'active_record/relation/predicate_builder/relation_handler'
-    autoload :ArrayHandler, 'active_record/relation/predicate_builder/array_handler'
+    delegate :resolve_column_aliases, to: :table
 
-    def initialize(klass, table)
-      @klass = klass
+    def initialize(table)
       @table = table
-    end
-
-    def resolve_column_aliases(hash)
-      hash = hash.dup
-      hash.keys.grep(Symbol) do |key|
-        if klass.attribute_alias? key
-          hash[klass.attribute_alias(key)] = hash.delete key
-        end
-      end
-      hash
+      @handlers = []
+
+      register_handler(BasicObject, BasicObjectHandler.new(self))
+      register_handler(Class, ClassHandler.new(self))
+      register_handler(Base, BaseHandler.new(self))
+      register_handler(Range, RangeHandler.new(self))
+      register_handler(Relation, RelationHandler.new)
+      register_handler(Array, ArrayHandler.new(self))
+      register_handler(AssociationQueryValue, AssociationQueryHandler.new(self))
     end
 
     def build_from_hash(attributes)
@@ -26,35 +29,16 @@ module ActiveRecord
     end
 
     def expand(column, value)
-      queries = []
-
       # Find the foreign key when using queries such as:
       # Post.where(author: author)
       #
       # For polymorphic relationships, find the foreign key and type:
       # PriceEstimate.where(estimate_of: treasure)
-      if klass && reflection = klass._reflect_on_association(column)
-        if reflection.polymorphic? && base_class = polymorphic_base_class_from_value(value)
-          queries << self.class.build(table[reflection.foreign_type], base_class.name)
-        end
-
-        column = reflection.foreign_key
+      if table.associated_with?(column)
+        value = AssociationQueryValue.new(table.associated_table(column), value)
       end
 
-      queries << self.class.build(table[column], value)
-      queries
-    end
-
-    def polymorphic_base_class_from_value(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
+      build(table.arel_attribute(column), value)
     end
 
     def self.references(attributes)
@@ -79,46 +63,24 @@ module ActiveRecord
     #       )
     #     end
     #     ActiveRecord::PredicateBuilder.register_handler(MyCustomDateRange, handler)
-    def self.register_handler(klass, handler)
+    def register_handler(klass, handler)
       @handlers.unshift([klass, handler])
     end
 
-    register_handler(BasicObject, ->(attribute, value) { attribute.eq(value) })
-    register_handler(Class, ->(attribute, value) { deprecate_class_handler; attribute.eq(value.name) })
-    register_handler(Base, ->(attribute, value) { attribute.eq(value.id) })
-    register_handler(Range, ->(attribute, value) { attribute.between(value) })
-    register_handler(Relation, RelationHandler.new)
-    register_handler(Array, ArrayHandler.new)
-
-    def self.build(attribute, value)
+    def build(attribute, value)
       handler_for(value).call(attribute, value)
     end
 
-    def self.handler_for(object)
-      @handlers.detect { |klass, _| klass === object }.last
-    end
-    private_class_method :handler_for
-
-    def self.deprecate_class_handler
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-        Passing a class as a value in an Active Record query is deprecated and
-        will be removed. Pass a string instead.
-      MSG
-    end
-
     protected
 
-    attr_reader :klass, :table
+    attr_reader :table
 
     def expand_from_hash(attributes)
       return ["1=0"] if attributes.empty?
 
       attributes.flat_map do |key, value|
         if value.is_a?(Hash)
-          arel_table = Arel::Table.new(key)
-          association = klass._reflect_on_association(key)
-          builder = self.class.new(association && association.klass, arel_table)
-
+          builder = self.class.new(table.associated_table(key))
           builder.expand_from_hash(value)
         else
           expand(key, value)
@@ -141,5 +103,9 @@ module ActiveRecord
 
       attributes
     end
+
+    def handler_for(object)
+      @handlers.detect { |klass, _| klass === object }.last
+    end
   end
 end