1 files changed, 61 insertions, 24 deletions
diff --git a/activerecord/test/cases/relation/where_chain_test.rb b/activerecord/test/cases/relation/where_chain_test.rb
index fd2420cb88..07d7cae514 100644
--- a/activerecord/test/cases/relation/where_chain_test.rb
+++ b/activerecord/test/cases/relation/where_chain_test.rb
@@ -12,9 +12,15 @@ module ActiveRecord
     end
 
     def test_not_eq
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], 'hello')
       relation = Post.where.not(title: 'hello')
-      assert_equal([expected], relation.where_values)
+
+      assert_equal 1, relation.where_values.length
+
+      value = relation.where_values.first
+      bind  = relation.bind_values.first
+
+      assert_bound_ast value, Post.arel_table[@name], Arel::Nodes::NotEqual
+      assert_equal 'hello', bind.last
     end
 
     def test_not_null
@@ -44,21 +50,29 @@ module ActiveRecord
     def test_not_eq_with_preceding_where
       relation = Post.where(title: 'hello').where.not(title: 'world')
 
-      expected = Arel::Nodes::Equality.new(Post.arel_table[@name], 'hello')
-      assert_equal(expected, relation.where_values.first)
+      value = relation.where_values.first
+      bind  = relation.bind_values.first
+      assert_bound_ast value, Post.arel_table[@name], Arel::Nodes::Equality
+      assert_equal 'hello', bind.last
 
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], 'world')
-      assert_equal(expected, relation.where_values.last)
+      value = relation.where_values.last
+      bind  = relation.bind_values.last
+      assert_bound_ast value, Post.arel_table[@name], Arel::Nodes::NotEqual
+      assert_equal 'world', bind.last
     end
 
     def test_not_eq_with_succeeding_where
       relation = Post.where.not(title: 'hello').where(title: 'world')
 
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], 'hello')
-      assert_equal(expected, relation.where_values.first)
+      value = relation.where_values.first
+      bind  = relation.bind_values.first
+      assert_bound_ast value, Post.arel_table[@name], Arel::Nodes::NotEqual
+      assert_equal 'hello', bind.last
 
-      expected = Arel::Nodes::Equality.new(Post.arel_table[@name], 'world')
-      assert_equal(expected, relation.where_values.last)
+      value = relation.where_values.last
+      bind  = relation.bind_values.last
+      assert_bound_ast value, Post.arel_table[@name], Arel::Nodes::Equality
+      assert_equal 'world', bind.last
     end
 
     def test_not_eq_with_string_parameter
@@ -79,38 +93,61 @@ module ActiveRecord
       expected = Arel::Nodes::NotIn.new(Post.arel_table['author_id'], [1, 2])
       assert_equal(expected, relation.where_values[0])
 
-      expected = Arel::Nodes::NotEqual.new(Post.arel_table[@name], 'ruby on rails')
-      assert_equal(expected, relation.where_values[1])
+      value = relation.where_values[1]
+      bind  = relation.bind_values.first
+
+      assert_bound_ast value, Post.arel_table[@name], Arel::Nodes::NotEqual
+      assert_equal 'ruby on rails', bind.last
     end
     
     def test_rewhere_with_one_condition
       relation = Post.where(title: 'hello').where(title: 'world').rewhere(title: 'alone')
 
-      expected = Arel::Nodes::Equality.new(Post.arel_table[@name], 'alone')
       assert_equal 1, relation.where_values.size
-      assert_equal expected, relation.where_values.first
+      value = relation.where_values.first
+      bind = relation.bind_values.first
+      assert_bound_ast value, Post.arel_table[@name], Arel::Nodes::Equality
+      assert_equal 'alone', bind.last
     end
 
     def test_rewhere_with_multiple_overwriting_conditions
       relation = Post.where(title: 'hello').where(body: 'world').rewhere(title: 'alone', body: 'again')
 
-      title_expected = Arel::Nodes::Equality.new(Post.arel_table['title'], 'alone')
-      body_expected  = Arel::Nodes::Equality.new(Post.arel_table['body'], 'again')
-
       assert_equal 2, relation.where_values.size
-      assert_equal title_expected, relation.where_values.first
-      assert_equal body_expected, relation.where_values.second
+
+      value = relation.where_values.first
+      bind = relation.bind_values.first
+      assert_bound_ast value, Post.arel_table['title'], Arel::Nodes::Equality
+      assert_equal 'alone', bind.last
+
+      value = relation.where_values[1]
+      bind = relation.bind_values[1]
+      assert_bound_ast value, Post.arel_table['body'], Arel::Nodes::Equality
+      assert_equal 'again', bind.last
+    end
+
+    def assert_bound_ast value, table, type
+      assert_equal table, value.left
+      assert_kind_of type, value
+      assert_kind_of Arel::Nodes::BindParam, value.right
     end
 
     def test_rewhere_with_one_overwriting_condition_and_one_unrelated
       relation = Post.where(title: 'hello').where(body: 'world').rewhere(title: 'alone')
 
-      title_expected = Arel::Nodes::Equality.new(Post.arel_table['title'], 'alone')
-      body_expected  = Arel::Nodes::Equality.new(Post.arel_table['body'], 'world')
-
       assert_equal 2, relation.where_values.size
-      assert_equal body_expected, relation.where_values.first
-      assert_equal title_expected, relation.where_values.second
+
+      value = relation.where_values.first
+      bind  = relation.bind_values.first
+
+      assert_bound_ast value, Post.arel_table['body'], Arel::Nodes::Equality
+      assert_equal 'world', bind.last
+
+      value = relation.where_values.second
+      bind  = relation.bind_values.second
+
+      assert_bound_ast value, Post.arel_table['title'], Arel::Nodes::Equality
+      assert_equal 'alone', bind.last
     end
   end
 end