set the environment variable from the rake file

activerecord/Rakefile

@@ -50,7 +50,6 @@ end
 
     t.verbose = true
     t.warning = true
-    t.ruby_opts = ["-r#{File.expand_path('../', __FILE__)}/test/connections/#{adapter}"]
   }
 
   task "isolated_test_#{adapter}" do
@@ -67,7 +66,13 @@ end
   namespace adapter do
     task :test => "test_#{adapter}"
     task :isolated_test => "isolated_test_#{adapter}"
+
+    # Set the connection environment for the adapter
+    task :env { ENV['ARCONN'] = adapter }
   end
+
+  # Make sure the adapter test evaluates the env setting task
+  task "test_#{adapter}" => "#{adapter}:env"
 end
 
 rule '.sqlite3' do |t|

activerecord/test/connections/db2.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'db2'

activerecord/test/connections/firebird.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'firebird'

activerecord/test/connections/frontbase.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'frontbase'

activerecord/test/connections/jdbcderby.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'jdbcderby'

activerecord/test/connections/jdbch2.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'jdbch2'

activerecord/test/connections/jdbchsqldb.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'jdbchsqldb'

activerecord/test/connections/jdbcmysql.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'jdbcmysql'

activerecord/test/connections/jdbcpostgresql.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'jdbcpostgresql'

activerecord/test/connections/jdbcsqlite3.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'jdbcsqlite3'

activerecord/test/connections/mysql.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'mysql'

activerecord/test/connections/mysql2.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'mysql2'

activerecord/test/connections/openbase.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'openbase'

activerecord/test/connections/oracle.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'oracle_enhanced'

activerecord/test/connections/postgresql.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'postgresql'

activerecord/test/connections/sqlite3.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'sqlite3'

activerecord/test/connections/sqlite3_mem.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'sqlite3_mem'

activerecord/test/connections/sybase.rb

@@ -1 +0,0 @@
-ENV['ARCONN'] = 'sybase'