kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove most references to where_values in QueryMethods

Browse source 
We're still using it in `where_unscoping`, which will require moving
additional logic.
This commit is contained in:
Sean Griffin 2015-01-25 17:20:04 -07:00
parent b6a9c620aa
commit 7227e4fba1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/relation/query_methods.rb
View file

@ -587,7 +587,7 @@ module ActiveRecord
references!(PredicateBuilder.references(opts)) references!(PredicateBuilder.references(opts))
end end
self.where_values += build_where(opts, rest) self.where_clause += where_clause_factory.build(opts, rest)
self self
end end
@ -876,7 +876,7 @@ module ActiveRecord
build_joins(arel, joins_values.flatten) unless joins_values.empty? 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? arel.having(*having_values.uniq.reject(&:blank?)) unless having_values.empty?