Remove most references to `where_values` in `QueryMethods`

We're still using it in `where_unscoping`, which will require moving
additional logic.

1 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index e277282ecd..c21730e6ae 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -587,7 +587,7 @@ module ActiveRecord
         references!(PredicateBuilder.references(opts))
       end
 
-      self.where_values += build_where(opts, rest)
+      self.where_clause += where_clause_factory.build(opts, rest)
       self
     end
 
@@ -876,7 +876,7 @@ module ActiveRecord
 
       build_joins(arel, joins_values.flatten) unless joins_values.empty?
 
-      collapse_wheres(arel, (where_values - [''])) #TODO: Add uniq with real value comparison / ignore uniqs that have binds
+      collapse_wheres(arel, (where_clause.predicates - [''])) #TODO: Add uniq with real value comparison / ignore uniqs that have binds
 
       arel.having(*having_values.uniq.reject(&:blank?)) unless having_values.empty?