Make both dblib and odbc test work in isolation.

Author: metaskills

Rakefile

@@ -8,6 +8,7 @@ require 'rake/rdoctask'
 def test_libs(mode='dblib')
   ['lib',
    'test',
+   "test/connections/#{mode}",
    "#{ENV['RAILS_SOURCE']}/activerecord/test"]
 end
 
@@ -21,7 +22,6 @@ def test_files
   files
 end
 
-
 task :test => ['test:dblib']
 task :default => [:test]
 
@@ -30,7 +30,6 @@ namespace :test do
   ['dblib','odbc'].each do |mode|
 
     Rake::TestTask.new(mode) do |t|
-      ENV.send :[]=, 'ARCONN', mode
       t.libs = test_libs(mode)
       t.test_files = test_files
       t.verbose = true

test/connections/dblib/connection_name.rb

@@ -0,0 +1,5 @@
+module ARTest
+  def self.sqlserver_connection_name
+    'dblib'
+  end
+end

test/connections/odbc/connection_name.rb

@@ -0,0 +1,5 @@
+module ARTest
+  def self.sqlserver_connection_name
+    'odbc'
+  end
+end

test/support/config.rb

@@ -1,59 +1,58 @@
+require 'connection_name'
+
 module ARTest
 
-  class << self
-    
-    def config
-      @config ||= {
+  def self.config
+    @config ||= {
+      
+      'default_connection' => sqlserver_connection_name,
+      
+      'connections' => {
 
-        'default_connection' => 'dblib',
+        'dblib' => {
+          'arunit' => {
+            'adapter'     => 'sqlserver',
+            'mode'        => 'dblib',
+            'dataserver'  => ENV['ACTIVERECORD_UNITTEST_DATASERVER'],
+            'username'    => ENV['ACTIVERECORD_UNITTEST_USER'] || 'rails',
+            'password'    => ENV['ACTIVERECORD_UNITTEST_PASS'] || '',
+            'database'    => 'activerecord_unittest',
+            'appname'     => 'SQLServerAdptrUnit',
+            'azure'       => !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil?
+          },
+          'arunit2' => {
+            'adapter'     => 'sqlserver',
+            'mode'        => 'dblib',
+            'dataserver'  => ENV['ACTIVERECORD_UNITTEST_DATASERVER'],
+            'username'    => ENV['ACTIVERECORD_UNITTEST_USER'] || 'rails',
+            'password'    => ENV['ACTIVERECORD_UNITTEST_PASS'] || '',
+            'database'    => 'activerecord_unittest2',
+            'appname'     => 'SQLServerAdptrUnit2',
+            'azure'       => !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil?
+          }
+        },
 
-        'connections' => {
-          
-          'dblib' => {
-            'arunit' => {
-              'adapter'     => 'sqlserver',
-              'mode'        => 'dblib',
-              'dataserver'  => ENV['ACTIVERECORD_UNITTEST_DATASERVER'],
-              'username'    => ENV['ACTIVERECORD_UNITTEST_USER'] || 'rails',
-              'password'    => ENV['ACTIVERECORD_UNITTEST_PASS'] || '',
-              'database'    => 'activerecord_unittest',
-              'appname'     => 'SQLServerAdptrUnit',
-              'azure'       => !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil?
-            },
-            'arunit2' => {
-              'adapter'     => 'sqlserver',
-              'mode'        => 'dblib',
-              'dataserver'  => ENV['ACTIVERECORD_UNITTEST_DATASERVER'],
-              'username'    => ENV['ACTIVERECORD_UNITTEST_USER'] || 'rails',
-              'password'    => ENV['ACTIVERECORD_UNITTEST_PASS'] || '',
-              'database'    => 'activerecord_unittest2',
-              'appname'     => 'SQLServerAdptrUnit2',
-              'azure'       => !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil?
-            }
+        'odbc' => {
+          'arunit' => {
+            'adapter'     => 'sqlserver',
+            'mode'        => 'odbc',
+            'host'        => 'localhost',
+            'username'    => 'rails',
+            'dsn'         => ENV['ACTIVERECORD_UNITTEST_DSN'] || 'activerecord_unittest',
+            'database'    => 'activerecord_unittest'
           },
-          
-          'odbc' => {
-            'arunit' => {
-              'adapter'     => 'sqlserver',
-              'mode'        => 'ODBC',
-              'host'        => 'localhost',
-              'username'    => 'rails',
-              'dsn'         => ENV['ACTIVERECORD_UNITTEST_DSN'] || 'activerecord_unittest',
-              'database'    => 'activerecord_unittest'
-            },
-            'arunit2' => {
-              'adapter'     => 'sqlserver',
-              'mode'        => 'ODBC',
-              'host'        => 'localhost',
-              'username'    => 'rails',
-              'dsn'         => ENV['ACTIVERECORD_UNITTEST2_DSN'] || 'activerecord_unittest2',
-              'database'    => 'activerecord_unittest2'
-            }
+          'arunit2' => {
+            'adapter'     => 'sqlserver',
+            'mode'        => 'odbc',
+            'host'        => 'localhost',
+            'username'    => 'rails',
+            'dsn'         => ENV['ACTIVERECORD_UNITTEST2_DSN'] || 'activerecord_unittest2',
+            'database'    => 'activerecord_unittest2'
           }
-          
         }
+        
       }
-    end
+    }
 
   end
 end