Test connections use AR::Base.configurations. References #5497.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4602 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 20 insertions, 19 deletions

diff --git a/activerecord/test/connections/native_frontbase/connection.rb b/activerecord/test/connections/native_frontbase/connection.rb
index e3d1d5b1e1..11dd8d275d 100644
--- a/activerecord/test/connections/native_frontbase/connection.rb
+++ b/activerecord/test/connections/native_frontbase/connection.rb
@@ -4,23 +4,24 @@ require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
-db1 = 'activerecord_unittest'
-db2 = 'activerecord_unittest2'
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter => 'frontbase',
+    :host => 'localhost',
+    :username => 'rails',
+    :password => '',
+    :database => 'activerecord_unittest',
+    :session_name => "unittest-#{$$}"
+  },
+  'arunit2' => {
+    :adapter => 'frontbase',
+    :host => 'localhost',
+    :username => 'rails',
+    :password => '',
+    :database => 'activerecord_unittest2',
+    :session_name => "unittest-#{$$}"
+  }
+}
 
-ActiveRecord::Base.establish_connection(
-  :adapter      => "frontbase",
-  :host         => "localhost",
-  :username     => "rails",
-  :password     => "",
-  :database     => db1,
-  :session_name => "unittest-#{$$}"
-)
-
-Course.establish_connection(
-  :adapter      => "frontbase",
-  :host         => "localhost",
-  :username     => "rails",
-  :password     => "",
-  :database     => db2,
-  :session_name => "unittest-#{$$}"
-)
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'