Remove badly written test for prequoting column names, Topic.find(:all) blows up using [[topics]] anyway. I'm sure we do not want to support using table_name= with a prequoted value. No other adapter does. Also moved tests around to better home. Added better assert_sql IGNORED regex and also a version of assert_sql that shows what queries were executed.

Author: metaskills

test/cases/adapter_test_sqlserver.rb

@@ -14,7 +14,11 @@ def setup
   end
 
   context 'For abstract behavior' do
-
+    
+    should 'raise invalid statement error' do
+      assert_raise(ActiveRecord::StatementInvalid) { Topic.connection.update_sql("UPDATE XXX") }
+    end
+    
     should 'be our adapter_name' do
       assert_equal 'SQLServer', @connection.adapter_name
     end
@@ -108,6 +112,21 @@ def setup
 
     end
 
+    context 'with different language' do
+
+      teardown do
+        @connection.execute("SET LANGUAGE us_english") rescue nil
+      end
+
+      should 'do a date insertion when language is german' do
+        @connection.execute("SET LANGUAGE deutsch")
+        assert_nothing_raised do
+          Task.create(:starting => Time.utc(2000, 1, 31, 5, 42, 0), :ending => Date.new(2006, 12, 31))
+        end
+      end
+
+    end
+    
   end
 
   context 'For identity inserts' do
@@ -173,31 +192,6 @@ def setup
 
   end
 
-  
-    
-  should 'raise invalid statement error' do
-    assert_raise(ActiveRecord::StatementInvalid) { Topic.connection.update_sql("UPDATE XXX") }
-  end
-  
-  should 'return real_number as float' do
-    assert_equal :float, TableWithRealColumn.columns_hash["real_number"].type
-  end
-  
-  context 'With different language' do
-
-    teardown do
-      @connection.execute("SET LANGUAGE us_english") rescue nil
-    end
-
-    should 'do a date insertion when language is german' do
-      @connection.execute("SET LANGUAGE deutsch")
-      assert_nothing_raised do
-        Task.create(:starting => Time.utc(2000, 1, 31, 5, 42, 0), :ending => Date.new(2006, 12, 31))
-      end
-    end
-
-  end
-  
   context 'For indexes' do
 
     setup do
@@ -214,25 +208,6 @@ def setup
 
   end
 
-  context 'For .table_name' do
-
-    setup do
-      @old_table_name, @new_table_name = Topic.table_name, '[topics]'
-      Topic.table_name = @new_table_name
-    end
-    
-    teardown do
-      Topic.table_name = @old_table_name
-    end
-    
-    should 'escape table name' do
-      assert_nothing_raised { @connection.select_all "SELECT * FROM #{@new_table_name}" }
-      assert_equal @new_table_name, Topic.table_name
-      assert_equal 12, Topic.columns.length
-    end
-
-  end
-  
 
 end
 

test/cases/column_test_sqlserver.rb

@@ -7,6 +7,9 @@ def setup
     @column_klass = ActiveRecord::ConnectionAdapters::SQLServerColumn
   end
 
+  should 'return real_number as float' do
+    assert_equal :float, TableWithRealColumn.columns_hash["real_number"].type
+  end
 
   context 'For :binary columns' do
 

test/cases/sqlserver_helper.rb

@@ -13,9 +13,24 @@
 
 class TableWithRealColumn < ActiveRecord::Base; end
 
-# See cases/helper in rails/activerecord. Tell assert_queries to ignore 
-# our SELECT SCOPE_IDENTITY stuff.
+
 ActiveRecord::Base.connection.class.class_eval do
-  IGNORED_SQL << /SELECT SCOPE_IDENTITY/
+  IGNORED_SQL << /SELECT SCOPE_IDENTITY/ << /INFORMATION_SCHEMA.TABLES/ << /INFORMATION_SCHEMA.COLUMNS/
+end
+
+module ActiveRecord 
+  class TestCase < ActiveSupport::TestCase
+    def assert_sql(*patterns_to_match)
+      $queries_executed = []
+      yield
+    ensure
+      failed_patterns = []
+      patterns_to_match.each do |pattern|
+        failed_patterns << pattern unless $queries_executed.any?{ |sql| pattern === sql }
+      end
+      assert failed_patterns.empty?, "Query pattern(s) #{failed_patterns.map(&:inspect).join(', ')} not found in:\n#{$queries_executed.inspect}"
+    end
+  end
 end
 
+