Renamed the "oci" adapter to "oracle", but kept the old name as an alias (closes #4017) [schoenm@earthlink.net]

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

1 files changed, 5 insertions, 5 deletions

diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index 4cdf24c03d..114e3cbd9e 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -17,7 +17,7 @@ class MasterCreditCard < ActiveRecord::Base; end
 class Post < ActiveRecord::Base; end
 class Computer < ActiveRecord::Base; end
 class NonExistentTable < ActiveRecord::Base; end
-class TestOCIDefault < ActiveRecord::Base; end
+class TestOracleDefault < ActiveRecord::Base; end
 
 class LoosePerson < ActiveRecord::Base
   attr_protected :credit_rating, :administrator
@@ -526,8 +526,8 @@ class BasicsTest < Test::Unit::TestCase
 
     # Oracle has some funky default handling, so it requires a bit of 
     # extra testing. See ticket #2788.
-    if current_adapter?(:OCIAdapter)
-      test = TestOCIDefault.new
+    if current_adapter?(:OracleAdapter)
+      test = TestOracleDefault.new
       assert_equal "X", test.test_char
       assert_equal "hello", test.test_string
       assert_equal 3, test.test_int
@@ -536,7 +536,7 @@ class BasicsTest < Test::Unit::TestCase
 
   def test_utc_as_time_zone
     # Oracle and SQLServer do not have a TIME datatype.
-    return true if current_adapter?(:SQLServerAdapter) || current_adapter?(:OCIAdapter)
+    return true if current_adapter?(:SQLServerAdapter) || current_adapter?(:OracleAdapter)
 
     Topic.default_timezone = :utc
     attributes = { "bonus_time" => "5:42:00AM" }
@@ -704,7 +704,7 @@ class BasicsTest < Test::Unit::TestCase
 
   def test_attributes_on_dummy_time
     # Oracle and SQL Server do not have a TIME datatype.
-    return true if current_adapter?(:SQLServerAdapter) || current_adapter?(:OCIAdapter)
+    return true if current_adapter?(:SQLServerAdapter) || current_adapter?(:OracleAdapter)
 
     attributes = {
       "bonus_time" => "5:42:00AM"