more coerced tests added and deleted

Author: Anna

test/cases/finder_test_sqlserver.rb

@@ -10,7 +10,6 @@ class FinderTest < ActiveRecord::TestCase
   COERCED_TESTS = [
     :test_exists_does_not_select_columns_without_alias,
     :test_string_sanitation,
-    :test_first_and_last_with_integer_should_use_sql_limit,
     :test_take_and_first_and_last_with_integer_should_use_sql_limit
   ]
 
@@ -27,16 +26,10 @@ def test_coerced_string_sanitation
     assert_equal "N'something; select table'", ActiveRecord::Base.sanitize("something; select table")
   end
 
-  def test_coerced_first_and_last_with_integer_should_use_sql_limit
-    assert_sql(/TOP \(2\)/) { Topic.first(2).entries }
-    assert_sql(/TOP \(5\)/) { Topic.last(5).entries }
-  end
-
   def test_coerced_take_and_first_and_last_with_integer_should_use_sql_limit
     assert_sql(/TOP \(3\)/) { Topic.take(3).entries }
     assert_sql(/TOP \(2\)/) { Topic.first(2).entries }
     assert_sql(/TOP \(5\)/) { Topic.last(5).entries }
   end
-
 end
 

test/cases/method_scoping_test_sqlserver.rb

@@ -0,0 +1,28 @@
+require "cases/sqlserver_helper"
+require 'models/post'
+
+
+class RelationTest < ActiveRecord::TestCase
+  COERCED_TESTS = [:test_merging_reorders_bind_params] 
+  # Until that patch is made to rails we are preventing this test from running in this gem.
+  include SqlserverCoercedTest
+  fixtures :posts
+  
+  def test_coerced_merging_reorders_bind_params
+    puts "RUNS"
+    post         = Post.first
+    id_column    = Post.columns_hash['id']
+    title_column = Post.columns_hash['title']
+
+    bvr = Post.connection.substitute_at id_column, 1
+    right  = Post.where(id: bvr)
+    right.bind_values += [[id_column, post.id]]
+
+    bvl = Post.connection.substitute_at title_column, 0
+    left   = Post.where(title: bvl)
+    left.bind_values += [[title_column, post.title]]
+
+    merged = left.merge(right)
+    assert_equal post, merged.first
+  end
+end