Pass a few more tests.

Author: metaskills

test/cases/coerced_tests.rb

@@ -320,6 +320,15 @@ class RelationTest < ActiveRecord::TestCase
   # We are not doing order duplicate removal anymore.
   coerce_tests! :test_order_using_scoping
 
+  # Account for our `EXEC sp_executesql...` statements.
+  coerce_tests! :test_to_sql_on_eager_join
+  def test_to_sql_on_eager_join_coerced
+    expected = assert_sql { Post.eager_load(:last_comment).order('comments.id DESC').to_a }.first
+    actual = Post.eager_load(:last_comment).order('comments.id DESC').to_sql
+    actual = "EXEC sp_executesql N'#{ActiveRecord::ConnectionAdapters::SQLServer::Utils.quote_string(actual)}'"
+    assert_equal expected, actual
+  end
+
 end
 
 
@@ -351,7 +360,7 @@ class SchemaDumperTest < ActiveRecord::TestCase
   coerce_tests! :test_schema_dump_keeps_large_precision_integer_columns_as_decimal
   def test_schema_dump_keeps_large_precision_integer_columns_as_decimal_coerced
     output = standard_dump
-    assert_match %r{t.integer\s+"atoms_in_universe",\s+precision: 38}, output
+    assert_match %r{t.decimal\s+"atoms_in_universe",\s+precision: 38}, output
   end
 
   # This accidently returns the wrong number because of our tables too.

test/cases/helper_sqlserver.rb

@@ -10,6 +10,8 @@
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase
 
+    SQLServer = ActiveRecord::ConnectionAdapters::SQLServer
+
     include ARTest::SQLServer::CoerceableTest
 
     let(:logger) { ActiveRecord::Base.logger }

test/cases/utils_test_sqlserver.rb

@@ -2,14 +2,12 @@
 
 class UtilsTestSQLServer < ActiveRecord::TestCase
 
-  Utils = ActiveRecord::ConnectionAdapters::SQLServer::Utils
-
   it '.quote_string' do
-    Utils.quote_string("I'll store this in C:\\Users").must_equal "I''ll store this in C:\\Users"
+    SQLServer::Utils.quote_string("I'll store this in C:\\Users").must_equal "I''ll store this in C:\\Users"
   end
 
   it '.unquote_string' do
-    Utils.unquote_string("I''ll store this in C:\\Users").must_equal "I'll store this in C:\\Users"
+    SQLServer::Utils.unquote_string("I''ll store this in C:\\Users").must_equal "I'll store this in C:\\Users"
   end
 
   describe '.extract_identifiers constructor and thus SQLServer::Utils::Name value object' do
@@ -44,7 +42,7 @@ class UtilsTestSQLServer < ActiveRecord::TestCase
 
     it 'extracts and returns #object identifier unquoted by default or quoted as needed' do
       valid_names.each do |n|
-        name = Utils.extract_identifiers(n)
+        name = SQLServer::Utils.extract_identifiers(n)
         name.object.must_equal 'object', "With #{n.inspect} for #object"
         name.object_quoted.must_equal '[object]', "With #{n.inspect} for #object_quoted"
       end
@@ -55,12 +53,12 @@ class UtilsTestSQLServer < ActiveRecord::TestCase
       it "extracts and returns #{part} identifier unquoted by default or quoted as needed" do
         present, blank = send(:"#{part}_names")
         present.each do |n|
-          name = Utils.extract_identifiers(n)
+          name = SQLServer::Utils.extract_identifiers(n)
           name.send(:"#{part}").must_equal "#{part}", "With #{n.inspect} for ##{part} method"
           name.send(:"#{part}_quoted").must_equal "[#{part}]", "With #{n.inspect} for ##{part}_quoted method"
         end
         blank.each do |n|
-          name = Utils.extract_identifiers(n)
+          name = SQLServer::Utils.extract_identifiers(n)
           name.send(:"#{part}").must_be_nil "With #{n.inspect} for ##{part} method"
           name.send(:"#{part}_quoted").must_be_nil "With #{n.inspect} for ##{part}_quoted method"
         end
@@ -69,23 +67,23 @@ class UtilsTestSQLServer < ActiveRecord::TestCase
     end
 
     it 'does not blow up on nil or blank string name' do
-      Utils.extract_identifiers(nil).object.must_be_nil
-      Utils.extract_identifiers(' ').object.must_be_nil
+      SQLServer::Utils.extract_identifiers(nil).object.must_be_nil
+      SQLServer::Utils.extract_identifiers(' ').object.must_be_nil
     end
 
     it 'has a #quoted that returns a fully quoted name with all identifiers as orginially passed in' do
-      Utils.extract_identifiers('object').quoted.must_equal '[object]'
-      Utils.extract_identifiers('server.database..object').quoted.must_equal '[server].[database]..[object]'
-      Utils.extract_identifiers('[server]...[object]').quoted.must_equal '[server]...[object]'
+      SQLServer::Utils.extract_identifiers('object').quoted.must_equal '[object]'
+      SQLServer::Utils.extract_identifiers('server.database..object').quoted.must_equal '[server].[database]..[object]'
+      SQLServer::Utils.extract_identifiers('[server]...[object]').quoted.must_equal '[server]...[object]'
     end
 
     it 'can take a symbol argument' do
-      Utils.extract_identifiers(:object).object.must_equal 'object'
+      SQLServer::Utils.extract_identifiers(:object).object.must_equal 'object'
     end
 
     it 'allows identifiers with periods to work' do
-      Utils.extract_identifiers('[obj.name]').quoted.must_equal '[obj.name]'
-      Utils.extract_identifiers('[obj.name].[foo]').quoted.must_equal '[obj.name].[foo]'
+      SQLServer::Utils.extract_identifiers('[obj.name]').quoted.must_equal '[obj.name]'
+      SQLServer::Utils.extract_identifiers('[obj.name].[foo]').quoted.must_equal '[obj.name].[foo]'
     end
 
   end

test/support/sql_counter_sqlserver.rb

@@ -10,7 +10,8 @@ def ignored_sql
         /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)/,
         /SELECT @@version/,
         /SELECT @@TRANCOUNT/,
-        /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/ ]
+        /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
+        /SELECT CAST\(.* AS .*\) AS value/ ]
     end
 
     def sql_counter_listenters