aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/connections
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-01 16:01:53 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-01 16:01:53 +0000
commit631181ca18d2a21c3e72039b0c7f6c5a0b2fc05a (patch)
tree616eff996cee75f95695580660e31291038dca0d /activerecord/test/connections
parent7056fc6782cba6dacccbba86cb231b58d8f5b4c8 (diff)
downloadrails-631181ca18d2a21c3e72039b0c7f6c5a0b2fc05a.tar.gz
rails-631181ca18d2a21c3e72039b0c7f6c5a0b2fc05a.tar.bz2
rails-631181ca18d2a21c3e72039b0c7f6c5a0b2fc05a.zip
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
Diffstat (limited to 'activerecord/test/connections')
-rw-r--r--activerecord/test/connections/native_oracle/connection.rb (renamed from activerecord/test/connections/native_oci/connection.rb)16
1 files changed, 7 insertions, 9 deletions
diff --git a/activerecord/test/connections/native_oci/connection.rb b/activerecord/test/connections/native_oracle/connection.rb
index 0b1babb898..095fe9d5ee 100644
--- a/activerecord/test/connections/native_oci/connection.rb
+++ b/activerecord/test/connections/native_oracle/connection.rb
@@ -1,25 +1,23 @@
-print "Using OCI Oracle\n"
+print "Using Oracle\n"
require_dependency 'fixtures/course'
require 'logger'
ActiveRecord::Base.logger = Logger.new STDOUT
ActiveRecord::Base.logger.level = Logger::WARN
-db1 = 'activerecord_unittest'
-db2 = 'activerecord_unittest2'
+# Set these to your database connection strings
+db = 'activerecord_unit_tests'
ActiveRecord::Base.establish_connection(
- :adapter => 'oci',
- :host => '', # can use an oracle SID
+ :adapter => 'oracle',
:username => 'arunit',
:password => 'arunit',
- :database => db1
+ :database => db
)
Course.establish_connection(
- :adapter => 'oci',
- :host => '', # can use an oracle SID
+ :adapter => 'oracle',
:username => 'arunit2',
:password => 'arunit2',
- :database => db2
+ :database => db
)