2 files changed, 68 insertions, 52 deletions

diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb
index 23500bf5d8..ff1c2a0d82 100644
--- a/activerecord/test/cases/relation/merging_test.rb
+++ b/activerecord/test/cases/relation/merging_test.rb
@@ -17,9 +17,7 @@ class RelationMergingTest < ActiveRecord::TestCase
   end
 
   def test_relation_to_sql
-    sql = Post.connection.unprepared_statement do
-      Post.first.comments.to_sql
-    end
+    sql = Post.first.comments.to_sql
     assert_no_match(/\?/, sql)
   end
 
@@ -81,31 +79,20 @@ class RelationMergingTest < ActiveRecord::TestCase
     left  = Post.where(title: "omg").where(comments_count: 1)
     right = Post.where(title: "wtf").where(title: "bbq")
 
-    expected = [left.where_values[1]] + right.where_values
+    expected = [left.bind_values[1]] + right.bind_values
     merged   = left.merge(right)
 
-    assert_equal expected, merged.where_values
+    assert_equal expected, merged.bind_values
     assert !merged.to_sql.include?("omg")
     assert merged.to_sql.include?("wtf")
     assert merged.to_sql.include?("bbq")
   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)
-
-    merged = left.merge(right)
-    assert_equal [], merged.bind_values
-  end
-
   def test_merging_keeps_lhs_bind_parameters
     column = Post.columns_hash['id']
     binds = [[column, 20]]
 
-    right  = Post.where(id: Arel::Nodes::BindParam.new('?'))
-    right.bind_values += binds
+    right  = Post.where(id: 20)
     left   = Post.where(id: 10)
 
     merged = left.merge(right)
@@ -113,17 +100,9 @@ class RelationMergingTest < ActiveRecord::TestCase
   end
 
   def test_merging_reorders_bind_params
-    post         = Post.first
-    id_column    = Post.columns_hash['id']
-    title_column = Post.columns_hash['title']
-
-    bv = Post.connection.substitute_at id_column, 0
-
-    right  = Post.where(id: bv)
-    right.bind_values += [[id_column, post.id]]
-
-    left   = Post.where(title: bv)
-    left.bind_values += [[title_column, post.title]]
+    post  = Post.first
+    right = Post.where(id: 1)
+    left  = Post.where(title: post.title)
 
     merged = left.merge(right)
     assert_equal post, merged.first
diff --git a/activerecord/test/cases/relation/where_chain_test.rb b/activerecord/test/cases/relation/where_chain_test.rb
index c628ca44ff..c6decaad89 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 = Post.arel_table[@name].not_eq('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 = Post.arel_table[@name].eq('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 = Post.arel_table[@name].not_eq('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 = Post.arel_table[@name].not_eq('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 = Post.arel_table[@name].eq('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 = Post.arel_table['author_id'].not_in([1, 2])
       assert_equal(expected, relation.where_values[0])
 
-      expected = Post.arel_table[@name].not_eq('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 = Post.arel_table[@name].eq('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 = Post.arel_table['title'].eq('alone')
-      body_expected  = Post.arel_table['body'].eq('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 = Post.arel_table['title'].eq('alone')
-      body_expected  = Post.arel_table['body'].eq('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