Support latest 3-1-stable ActiveRecord test conventions from Jon Leighton's work.

Author: metaskills

Rakefile

@@ -7,7 +7,6 @@ require 'rake/testtask'
 def test_libs(mode='dblib')
   ['lib',
    'test',
-   "test/connections/#{mode}",
    "#{ENV['RAILS_SOURCE']}/activerecord/test"]
 end
 
@@ -24,6 +23,7 @@ end
 task :test => ['test:dblib']
 task :default => [:test]
 
+
 namespace :test do
 
   ['dblib','odbc'].each do |mode|
@@ -36,8 +36,19 @@ namespace :test do
 
   end
 
+  task 'dblib:env' do
+    ENV['ARCONN'] = 'dblib'
+  end
+  
+  task 'odbc:env' do 
+    ENV['ARCONN'] = 'odbc'
+  end
+  
 end
 
+task 'test:dblib' => 'test:dblib:env'
+task 'test:odbc' => 'test:odbc:env'
+
 
 namespace :profile do
 

test/cases/sqlserver_helper.rb

@@ -5,6 +5,7 @@
 SQLSERVER_MIGRATIONS_ROOT = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'migrations'))
 SQLSERVER_SCHEMA_ROOT     = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'schema'))
 ACTIVERECORD_TEST_ROOT    = File.expand_path(File.join(ENV['RAILS_SOURCE'],'activerecord','test'))
+ENV['ARCONFIG']           = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'config.yml'))
 
 require 'rubygems'
 require 'bundler'
@@ -81,8 +82,10 @@ def method_added(method)
 
 module ActiveRecord
   class SQLCounter
-    IGNORED_SQL << %r|SELECT SCOPE_IDENTITY| << %r{INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)} << 
-                   %r|SELECT @@version| << %r|SELECT @@TRANCOUNT| << %r{(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION}
+    self.ignored_sql =  [ 
+      %r|SELECT SCOPE_IDENTITY|, %r{INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)},
+      %r|SELECT @@version|, %r|SELECT @@TRANCOUNT|, %r{(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION}
+    ]
   end
 end
 

test/config.yml

@@ -0,0 +1,31 @@
+default_connection: dblib
+
+default_connection_info: &default_connection_info
+  adapter: sqlserver
+  mode: <%= ENV['ARCONN'] %>
+  host: <%= ENV['ACTIVERECORD_UNITTEST_DATASERVER'] || 'localhost' %>
+  database: activerecord_unittest
+  username: <%= ENV['ACTIVERECORD_UNITTEST_USER'] || 'rails' %>
+  password: <%= ENV['ACTIVERECORD_UNITTEST_PASS'] || '' %>
+  azure: <%= !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil? %>
+
+connections:
+  
+  dblib:
+    arunit:
+      <<: *default_connection_info
+      appname: SQLServerAdptrUnit
+    arunit2:
+      <<: *default_connection_info
+      database: activerecord_unittest2
+      appname: SQLServerAdptrUnit2
+
+  odbc:
+    arunit:
+      <<: *default_connection_info
+      dsn: <%= ENV['ACTIVERECORD_UNITTEST2_DSN'] || 'activerecord_unittest' %>
+    arunit2:
+      <<: *default_connection_info
+      database: activerecord_unittest2
+      dsn: <%= ENV['ACTIVERECORD_UNITTEST2_DSN'] || 'activerecord_unittest2' %>
+