TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

allow merging a single where value

Browse Source
This commit is contained in:
Jon Leighton 2012-04-22 09:49:56 +02:00
parent f3fce59d13
commit e8cdb3d5e7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/relation/merger.rb
View File

@ -85,7 +85,7 @@ def merged_binds
def merged_wheres
if values[:where]
merged_wheres = relation.where_values + values[:where]
merged_wheres = relation.where_values + Array(values[:where])
unless relation.where_values.empty?
# Remove duplicates, last one wins.

6
activerecord/test/cases/relation_test.rb
View File

@ -156,6 +156,12 @@ def test_references_values_dont_duplicate
relation = Relation.new(:a, :b, where: [:foo])
assert_equal [:foo], relation.where_values
end
test 'merging a single where value' do
relation = Relation.new(:a, :b)
relation.merge!(where: :foo)
assert_equal [:foo], relation.where_values
end
end
class RelationMutationTest < ActiveSupport::TestCase