Permalink
Browse files

updating configs for oracle

  • Loading branch information...
1 parent 29c7258 commit e6c2d5450b4667c8f9ad327d1cbcfc404960cc04 @tenderlove tenderlove committed Jun 6, 2011
Showing with 14 additions and 20 deletions.
  1. +13 −13 activerecord/test/config.example.yml
  2. +1 −7 activerecord/test/connections/oracle.rb
@@ -91,19 +91,19 @@ connections:
arunit2:
username: admin
- oracle:
- arunit:
- adapter: oracle_enhanced
- database: <%= ENV['ARUNIT_DB_NAME'] || 'orcl' %>
- username: arunit
- password: arunit
- emulate_oracle_adapter: true
- arunit:
- adapter: oracle_enhanced
- database: <%= ENV['ARUNIT_DB_NAME'] || 'orcl' %>
- username: arunit2
- password: arunit2
- emulate_oracle_adapter: true
+ oracle_enhanced:
+ arunit:
+ adapter: oracle_enhanced
+ database: <%= ENV['ARUNIT_DB_NAME'] || 'orcl' %>
+ username: <%= ENV['ARUNIT_USER_NAME'] || 'arunit' %>
+ password: <%= ENV['ARUNIT_PASSWORD'] || 'arunit' %>
+ emulate_oracle_adapter: true
+ arunit2:
+ adapter: oracle_enhanced
+ database: <%= ENV['ARUNIT_DB_NAME'] || 'orcl' %>
+ username: <%= ENV['ARUNIT2_USER_NAME'] || 'arunit2' %>
+ password: <%= ENV['ARUNIT2_PASSWORD'] || 'arunit2' %>
+ emulate_oracle_adapter: true
postgresql:
arunit:
@@ -1,7 +1 @@
-ENV['ARCONN'] = 'oracle'
-
-# uses oracle_enhanced adapter in ENV['ORACLE_ENHANCED_PATH'] or from github.com/rsim/oracle-enhanced.git
-require 'active_record/connection_adapters/oracle_enhanced_adapter'
-
-# otherwise failed with silence_warnings method missing exception
-require 'active_support/core_ext/kernel/reporting'
+ENV['ARCONN'] = 'oracle_enhanced'

0 comments on commit e6c2d54

Please sign in to comment.