Merge commit 'h-lame/master'

Author: jrafanie

test/cases/aaa_create_tables_test_sqlserver.rb

@@ -1,4 +1,4 @@
-require 'cases/helper'
+require 'cases/sqlserver_helper'
 require "cases/aaa_create_tables_test"
 
 # TODO Should this really be in the same test class as the "real" one in rails?

test/cases/aaaa_create_tables_test_sqlserver.rb

@@ -1,5 +1,5 @@
 # The filename begins with "aaaa" to ensure this is the first test.
-require 'cases/helper'
+require 'cases/sqlserver_helper'
 
 class AAAACreateTablesTestSqlserver < ActiveRecord::TestCase
   self.use_transactional_fixtures = false

test/cases/adapter_test_sqlserver.rb

@@ -1,4 +1,4 @@
-require 'cases/helper'
+require 'cases/sqlserver_helper'
 require 'models/default'
 require 'models/post'
 require 'models/task'

test/cases/affected_rows_test_sqlserver.rb

@@ -1,4 +1,4 @@
-require 'cases/helper' 
+require 'cases/sqlserver_helper'
 require 'models/topic' 
 require 'models/reply' 
 

test/cases/offset_and_limit_test.rb

@@ -1,4 +1,4 @@
-require 'cases/helper'
+require 'cases/sqlserver_helper'
 # require File.dirname(__FILE__) + '/../../lib/shoulda'
 
 def uses_shoulda(&blk)

test/cases/sqlserver_helper.rb

@@ -0,0 +1,9 @@
+require 'cases/helper'
+
+# See cases/helper in rails/activerecord for why we do this - it'd be nice if there was
+# an API for adapaters to influence the tests in this way.  Anyway, it's to tell asser_queries
+# to ignore our SELECT SCOPE_IDENTITY stuff.
+ActiveRecord::Base.connection.class.class_eval do
+  IGNORED_SQL << /SELECT SCOPE_IDENTITY/
+end
+

test/cases/table_name_test_sqlserver.rb

@@ -1,4 +1,4 @@
-require "cases/helper"
+require 'cases/sqlserver_helper'
 require 'active_record/schema'
 require 'models/order'