1 files changed, 4 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index daafb0b645..cdafa6a50a 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -16,17 +16,17 @@ module ActiveRecord
 
     include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches, Explain, Delegation
 
-    attr_reader :table, :klass, :loaded
+    attr_reader :table, :klass, :loaded, :predicate_builder
     alias :model :klass
     alias :loaded? :loaded
 
-    def initialize(klass, table, values = {})
+    def initialize(klass, table, predicate_builder, values = {})
       @klass  = klass
       @table  = table
       @values = values
       @offsets = {}
       @loaded = false
-      @predicate_builder = PredicateBuilder.new(klass, table)
+      @predicate_builder = predicate_builder
     end
 
     def initialize_copy(other)
@@ -569,7 +569,7 @@ module ActiveRecord
         [name, binds.fetch(name.to_s) {
           case where.right
           when Array then where.right.map(&:val)
-          else
+          when Arel::Nodes::Casted, Arel::Nodes::Quoted
             where.right.val
           end
         }]
@@ -633,10 +633,6 @@ module ActiveRecord
       "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
 
-    protected
-
-    attr_reader :predicate_builder
-
     private
 
     def exec_queries