aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-01-14 11:52:35 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-01-14 11:52:35 -0800
commitc65cfd7648349e3a41206b6e821b3412d4d3ccd8 (patch)
tree64b7cfc433ba01aaabcdc0bddaa931f8409a1fe0 /activerecord
parent2f8853004a37950b5076e9a3e15e8b5aeb7e558a (diff)
downloadrails-c65cfd7648349e3a41206b6e821b3412d4d3ccd8.tar.gz
rails-c65cfd7648349e3a41206b6e821b3412d4d3ccd8.tar.bz2
rails-c65cfd7648349e3a41206b6e821b3412d4d3ccd8.zip
switch to arrays for bind removal test
we can't make bind values for arrays yet
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/relations_test.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 6fa749a084..06f7a61a6c 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1534,10 +1534,8 @@ class RelationTest < ActiveRecord::TestCase
end
def test_merging_removes_rhs_bind_parameters
- left = Post.where(id: Arel::Nodes::BindParam.new('?'))
- column = Post.columns_hash['id']
- left.bind_values += [[column, 20]]
- right = Post.where(id: 10)
+ left = Post.where(id: 20)
+ right = Post.where(id: [1,2,3,4])
merged = left.merge(right)
assert_equal [], merged.bind_values